diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.svg b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.svg
index f55242a..96c83d1 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_1.svg
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image381" 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="#image381"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 935.5 879.5 L 982.5 879.5 L 982.5 926.5 L 935.5 926.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <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="#image409"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1367.5 666.5 L 1408.5 666.5 L 1408.5 844.5 L 1367.5 844.5 Z M 522.5 666.5 L 563.5 666.5 L 563.5 844.5 L 522.5 844.5 Z M 794.5 666.5 L 835.5 666.5 L 835.5 844.5 L 794.5 844.5 Z M 920.5 666.5 L 961.5 666.5 L 961.5 844.5 L 920.5 844.5 Z M 1060.5 666.5 L 1101.5 666.5 L 1101.5 844.5 L 1060.5 844.5 Z M 1256.5 666.5 L 1297.5 666.5 L 1297.5 844.5 L 1256.5 844.5 Z M 1256.5 666.5 "/>
 </clipPath>
-<image id="image382" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1369.5 228.5 L 1410.5 228.5 L 1410.5 502.5 L 1369.5 502.5 Z M 511.5 228.5 L 552.5 228.5 L 552.5 502.5 L 511.5 502.5 Z M 811.5 228.5 L 852.5 228.5 L 852.5 502.5 L 811.5 502.5 Z M 920.5 228.5 L 961.5 228.5 L 961.5 502.5 L 920.5 502.5 Z M 1060.5 228.5 L 1101.5 228.5 L 1101.5 502.5 L 1060.5 502.5 Z M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 1254.5 228.5 "/>
 </clipPath>
-<image id="image383" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image384" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface378">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -217,6 +217,5 @@
 <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 1189 520 L 1236 520 M 1189 473 L 1236 473 M 1189 473 L 1189 520 M 1236 473 L 1236 520 " 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 1189 520 L 1236 520 M 1189 473 L 1236 473 M 1236 520 L 1236 473 M 1189 520 L 1189 473 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.svg b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.svg
index 42a25f7..b1c7a86 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_2.svg
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image400" 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="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 370.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1415.5 666.5 L 1456.5 666.5 L 1456.5 844.5 L 1415.5 844.5 Z M 470.5 666.5 L 511.5 666.5 L 511.5 844.5 L 470.5 844.5 Z M 588.5 666.5 L 629.5 666.5 L 629.5 844.5 L 588.5 844.5 Z M 873.5 666.5 L 915.5 666.5 L 915.5 844.5 L 873.5 844.5 Z M 991.5 666.5 L 1032.5 666.5 L 1032.5 844.5 L 991.5 844.5 Z M 1135.5 666.5 L 1176.5 666.5 L 1176.5 844.5 L 1135.5 844.5 Z M 1267.5 666.5 L 1308.5 666.5 L 1308.5 844.5 L 1267.5 844.5 Z M 1267.5 666.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1415.5 228.5 L 1456.5 228.5 L 1456.5 502.5 L 1415.5 502.5 Z M 448.5 228.5 L 489.5 228.5 L 489.5 502.5 L 448.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 873.5 228.5 L 915.5 228.5 L 915.5 502.5 L 873.5 502.5 Z M 972.5 228.5 L 1013.5 228.5 L 1013.5 502.5 L 972.5 502.5 Z M 1120.5 228.5 L 1161.5 228.5 L 1161.5 502.5 L 1120.5 502.5 Z M 1267.5 228.5 L 1308.5 228.5 L 1308.5 502.5 L 1267.5 502.5 Z M 1267.5 228.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface369">
+<g id="surface397">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -212,6 +212,5 @@
 <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 370 938 L 417 938 M 370 892 L 417 892 M 370 892 L 370 938 M 417 892 L 417 938 " 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 370 938 L 417 938 M 370 892 L 417 892 M 417 938 L 417 892 M 370 938 L 370 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.svg b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.svg
index 22bed0b..a956dad 100644
--- a/cells/a2111o/sky130_fd_sc_hd__a2111o_4.svg
+++ b/cells/a2111o/sky130_fd_sc_hd__a2111o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 238.5 779.5 "/>
 </clipPath>
 <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="#image369"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1600.5 626.5 L 1629.5 626.5 L 1629.5 750.5 L 1600.5 750.5 Z M 304.5 626.5 L 332.5 626.5 L 332.5 750.5 L 304.5 750.5 Z M 386.5 626.5 L 415.5 626.5 L 415.5 750.5 L 386.5 750.5 Z M 468.5 626.5 L 497.5 626.5 L 497.5 750.5 L 468.5 750.5 Z M 557.5 626.5 L 586.5 626.5 L 586.5 750.5 L 557.5 750.5 Z M 650.5 626.5 L 679.5 626.5 L 679.5 750.5 L 650.5 750.5 Z M 835.5 626.5 L 864.5 626.5 L 864.5 750.5 L 835.5 750.5 Z M 919.5 626.5 L 947.5 626.5 L 947.5 750.5 L 919.5 750.5 Z M 1001.5 626.5 L 1030.5 626.5 L 1030.5 750.5 L 1001.5 750.5 Z M 1188.5 626.5 L 1217.5 626.5 L 1217.5 750.5 L 1188.5 750.5 Z M 1271.5 626.5 L 1299.5 626.5 L 1299.5 750.5 L 1271.5 750.5 Z M 1353.5 626.5 L 1382.5 626.5 L 1382.5 750.5 L 1353.5 750.5 Z M 1435.5 626.5 L 1464.5 626.5 L 1464.5 750.5 L 1435.5 750.5 Z M 1518.5 626.5 L 1546.5 626.5 L 1546.5 750.5 L 1518.5 750.5 Z M 1518.5 626.5 "/>
 </clipPath>
-<image id="image341" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1600.5 320.5 L 1629.5 320.5 L 1629.5 511.5 L 1600.5 511.5 Z M 290.5 320.5 L 319.5 320.5 L 319.5 511.5 L 290.5 511.5 Z M 372.5 320.5 L 401.5 320.5 L 401.5 511.5 L 372.5 511.5 Z M 455.5 320.5 L 483.5 320.5 L 483.5 511.5 L 455.5 511.5 Z M 537.5 320.5 L 566.5 320.5 L 566.5 511.5 L 537.5 511.5 Z M 717.5 320.5 L 746.5 320.5 L 746.5 511.5 L 717.5 511.5 Z M 799.5 320.5 L 828.5 320.5 L 828.5 511.5 L 799.5 511.5 Z M 926.5 320.5 L 955.5 320.5 L 955.5 511.5 L 926.5 511.5 Z M 1009.5 320.5 L 1037.5 320.5 L 1037.5 511.5 L 1009.5 511.5 Z M 1188.5 320.5 L 1217.5 320.5 L 1217.5 511.5 L 1188.5 511.5 Z M 1271.5 320.5 L 1299.5 320.5 L 1299.5 511.5 L 1271.5 511.5 Z M 1353.5 320.5 L 1382.5 320.5 L 1382.5 511.5 L 1353.5 511.5 Z M 1435.5 320.5 L 1464.5 320.5 L 1464.5 511.5 L 1435.5 511.5 Z M 1518.5 320.5 L 1546.5 320.5 L 1546.5 511.5 L 1518.5 511.5 Z M 1518.5 320.5 "/>
 </clipPath>
-<image id="image342" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image343" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -187,6 +187,5 @@
 <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 238 821 L 271 821 M 238 788 L 271 788 M 238 788 L 238 821 M 271 788 L 271 821 " 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 238 821 L 271 821 M 238 788 L 271 788 M 271 821 L 271 788 M 238 821 L 238 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.svg b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.svg
index 4ee52bc..b6e90f8 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.svg
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" 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="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1163.5 729.5 L 1204.5 729.5 L 1204.5 844.5 L 1163.5 844.5 Z M 693.5 729.5 L 734.5 729.5 L 734.5 844.5 L 693.5 844.5 Z M 811.5 729.5 L 852.5 729.5 L 852.5 844.5 L 811.5 844.5 Z M 947.5 729.5 L 988.5 729.5 L 988.5 844.5 L 947.5 844.5 Z M 1065.5 729.5 L 1106.5 729.5 L 1106.5 844.5 L 1065.5 844.5 Z M 1065.5 729.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1172.5 228.5 L 1213.5 228.5 L 1213.5 403.5 L 1172.5 403.5 Z M 712.5 228.5 L 753.5 228.5 L 753.5 403.5 L 712.5 403.5 Z M 811.5 228.5 L 852.5 228.5 L 852.5 403.5 L 811.5 403.5 Z M 909.5 228.5 L 950.5 228.5 L 950.5 403.5 L 909.5 403.5 Z M 1027.5 228.5 L 1068.5 228.5 L 1068.5 403.5 L 1027.5 403.5 Z M 1027.5 228.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface367">
+<g id="surface395">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -209,6 +209,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.svg b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.svg
index cfaf7cf..9402344 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.svg
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image413" 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="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 998.5 879.5 L 1044.5 879.5 L 1044.5 926.5 L 998.5 926.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1306.5 666.5 L 1347.5 666.5 L 1347.5 844.5 L 1306.5 844.5 Z M 703.5 666.5 L 744.5 666.5 L 744.5 844.5 L 703.5 844.5 Z M 849.5 666.5 L 890.5 666.5 L 890.5 844.5 L 849.5 844.5 Z M 991.5 666.5 L 1032.5 666.5 L 1032.5 844.5 L 991.5 844.5 Z M 1194.5 666.5 L 1235.5 666.5 L 1235.5 844.5 L 1194.5 844.5 Z M 1194.5 666.5 "/>
 </clipPath>
-<image id="image386" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1307.5 228.5 L 1348.5 228.5 L 1348.5 502.5 L 1307.5 502.5 Z M 713.5 228.5 L 755.5 228.5 L 755.5 502.5 L 713.5 502.5 Z M 849.5 228.5 L 890.5 228.5 L 890.5 502.5 L 849.5 502.5 Z M 991.5 228.5 L 1032.5 228.5 L 1032.5 502.5 L 991.5 502.5 Z M 1191.5 228.5 L 1232.5 228.5 L 1232.5 502.5 L 1191.5 502.5 Z M 1191.5 228.5 "/>
 </clipPath>
-<image id="image387" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image388" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface382">
+<g id="surface410">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -218,6 +218,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.svg b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.svg
index 0ce12a4..f2f9e4c 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.svg
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1528.5 662.5 L 1568.5 662.5 L 1568.5 835.5 L 1528.5 835.5 Z M 339.5 662.5 L 379.5 662.5 L 379.5 835.5 L 339.5 835.5 Z M 453.5 662.5 L 493.5 662.5 L 493.5 835.5 L 453.5 835.5 Z M 568.5 662.5 L 607.5 662.5 L 607.5 835.5 L 568.5 835.5 Z M 711.5 662.5 L 751.5 662.5 L 751.5 835.5 L 711.5 835.5 Z M 838.5 662.5 L 877.5 662.5 L 877.5 835.5 L 838.5 835.5 Z M 981.5 662.5 L 1021.5 662.5 L 1021.5 835.5 L 981.5 835.5 Z M 1095.5 662.5 L 1135.5 662.5 L 1135.5 835.5 L 1095.5 835.5 Z M 1282.5 662.5 L 1322.5 662.5 L 1322.5 835.5 L 1282.5 835.5 Z M 1413.5 662.5 L 1453.5 662.5 L 1453.5 835.5 L 1413.5 835.5 Z M 1413.5 662.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1528.5 237.5 L 1568.5 237.5 L 1568.5 503.5 L 1528.5 503.5 Z M 339.5 237.5 L 379.5 237.5 L 379.5 503.5 L 339.5 503.5 Z M 453.5 237.5 L 493.5 237.5 L 493.5 503.5 L 453.5 503.5 Z M 568.5 237.5 L 607.5 237.5 L 607.5 503.5 L 568.5 503.5 Z M 682.5 237.5 L 722.5 237.5 L 722.5 503.5 L 682.5 503.5 Z M 807.5 237.5 L 847.5 237.5 L 847.5 503.5 L 807.5 503.5 Z M 921.5 237.5 L 961.5 237.5 L 961.5 503.5 L 921.5 503.5 Z M 1174.5 237.5 L 1214.5 237.5 L 1214.5 503.5 L 1174.5 503.5 Z M 1288.5 237.5 L 1328.5 237.5 L 1328.5 503.5 L 1288.5 503.5 Z M 1403.5 237.5 L 1443.5 237.5 L 1443.5 503.5 L 1403.5 503.5 Z M 1403.5 237.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.svg b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.svg
index 4b9f7dd..513ef7b 100644
--- a/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.svg
+++ b/cells/a2111oi/sky130_fd_sc_hd__a2111oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" 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="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1609.5 605.5 L 1631.5 605.5 L 1631.5 702.5 L 1609.5 702.5 Z M 265.5 605.5 L 287.5 605.5 L 287.5 702.5 L 265.5 702.5 Z M 328.5 605.5 L 350.5 605.5 L 350.5 702.5 L 328.5 702.5 Z M 392.5 605.5 L 414.5 605.5 L 414.5 702.5 L 392.5 702.5 Z M 456.5 605.5 L 479.5 605.5 L 479.5 702.5 L 456.5 702.5 Z M 532.5 605.5 L 555.5 605.5 L 555.5 702.5 L 532.5 702.5 Z M 597.5 605.5 L 619.5 605.5 L 619.5 702.5 L 597.5 702.5 Z M 661.5 605.5 L 683.5 605.5 L 683.5 702.5 L 661.5 702.5 Z M 725.5 605.5 L 748.5 605.5 L 748.5 702.5 L 725.5 702.5 Z M 806.5 605.5 L 828.5 605.5 L 828.5 702.5 L 806.5 702.5 Z M 870.5 605.5 L 893.5 605.5 L 893.5 702.5 L 870.5 702.5 Z M 934.5 605.5 L 957.5 605.5 L 957.5 702.5 L 934.5 702.5 Z M 999.5 605.5 L 1021.5 605.5 L 1021.5 702.5 L 999.5 702.5 Z M 1145.5 605.5 L 1167.5 605.5 L 1167.5 702.5 L 1145.5 702.5 Z M 1209.5 605.5 L 1232.5 605.5 L 1232.5 702.5 L 1209.5 702.5 Z M 1274.5 605.5 L 1296.5 605.5 L 1296.5 702.5 L 1274.5 702.5 Z M 1338.5 605.5 L 1360.5 605.5 L 1360.5 702.5 L 1338.5 702.5 Z M 1416.5 605.5 L 1439.5 605.5 L 1439.5 702.5 L 1416.5 702.5 Z M 1480.5 605.5 L 1503.5 605.5 L 1503.5 702.5 L 1480.5 702.5 Z M 1545.5 605.5 L 1567.5 605.5 L 1567.5 702.5 L 1545.5 702.5 Z M 1545.5 605.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1598.5 366.5 L 1620.5 366.5 L 1620.5 516.5 L 1598.5 516.5 Z M 264.5 366.5 L 286.5 366.5 L 286.5 516.5 L 264.5 516.5 Z M 328.5 366.5 L 350.5 366.5 L 350.5 516.5 L 328.5 516.5 Z M 392.5 366.5 L 414.5 366.5 L 414.5 516.5 L 392.5 516.5 Z M 456.5 366.5 L 479.5 366.5 L 479.5 516.5 L 456.5 516.5 Z M 521.5 366.5 L 543.5 366.5 L 543.5 516.5 L 521.5 516.5 Z M 585.5 366.5 L 607.5 366.5 L 607.5 516.5 L 585.5 516.5 Z M 649.5 366.5 L 671.5 366.5 L 671.5 516.5 L 649.5 516.5 Z M 713.5 366.5 L 736.5 366.5 L 736.5 516.5 L 713.5 516.5 Z M 855.5 366.5 L 878.5 366.5 L 878.5 516.5 L 855.5 516.5 Z M 919.5 366.5 L 942.5 366.5 L 942.5 516.5 L 919.5 516.5 Z M 984.5 366.5 L 1006.5 366.5 L 1006.5 516.5 L 984.5 516.5 Z M 1048.5 366.5 L 1070.5 366.5 L 1070.5 516.5 L 1048.5 516.5 Z M 1114.5 366.5 L 1136.5 366.5 L 1136.5 516.5 L 1114.5 516.5 Z M 1178.5 366.5 L 1200.5 366.5 L 1200.5 516.5 L 1178.5 516.5 Z M 1242.5 366.5 L 1265.5 366.5 L 1265.5 516.5 L 1242.5 516.5 Z M 1309.5 366.5 L 1332.5 366.5 L 1332.5 516.5 L 1309.5 516.5 Z M 1392.5 366.5 L 1414.5 366.5 L 1414.5 516.5 L 1392.5 516.5 Z M 1456.5 366.5 L 1478.5 366.5 L 1478.5 516.5 L 1456.5 516.5 Z M 1534.5 366.5 L 1556.5 366.5 L 1556.5 516.5 L 1534.5 516.5 Z M 1534.5 366.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 225 761 L 251 761 M 225 735 L 251 735 M 225 735 L 225 761 M 251 735 L 251 761 " 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 225 761 L 251 761 M 225 735 L 251 735 M 251 761 L 251 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_1.svg b/cells/a211o/sky130_fd_sc_hd__a211o_1.svg
index f8645fa..d1c678f 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_1.svg
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 559.5 885.5 "/>
 </clipPath>
 <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="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1252.5 666.5 L 1293.5 666.5 L 1293.5 844.5 L 1252.5 844.5 Z M 631.5 666.5 L 672.5 666.5 L 672.5 844.5 L 631.5 844.5 Z M 891.5 666.5 L 932.5 666.5 L 932.5 844.5 L 891.5 844.5 Z M 1009.5 666.5 L 1050.5 666.5 L 1050.5 844.5 L 1009.5 844.5 Z M 1127.5 666.5 L 1168.5 666.5 L 1168.5 844.5 L 1127.5 844.5 Z M 1127.5 666.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1252.5 228.5 L 1293.5 228.5 L 1293.5 502.5 L 1252.5 502.5 Z M 631.5 228.5 L 672.5 228.5 L 672.5 502.5 L 631.5 502.5 Z M 891.5 228.5 L 932.5 228.5 L 932.5 502.5 L 891.5 502.5 Z M 1009.5 228.5 L 1050.5 228.5 L 1050.5 502.5 L 1009.5 502.5 Z M 1127.5 228.5 L 1168.5 228.5 L 1168.5 502.5 L 1127.5 502.5 Z M 1127.5 228.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 1319 520 L 1366 520 M 1319 473 L 1366 473 M 1319 473 L 1319 520 M 1366 473 L 1366 520 " 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 1319 520 L 1366 520 M 1319 473 L 1366 473 M 1366 520 L 1366 473 M 1319 520 L 1319 473 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_2.svg b/cells/a211o/sky130_fd_sc_hd__a211o_2.svg
index 074db6f..aad952a 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_2.svg
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 683.5 666.5 L 724.5 666.5 L 724.5 844.5 L 683.5 844.5 Z M 893.5 666.5 L 934.5 666.5 L 934.5 844.5 L 893.5 844.5 Z M 1046.5 666.5 L 1087.5 666.5 L 1087.5 844.5 L 1046.5 844.5 Z M 1184.5 666.5 L 1225.5 666.5 L 1225.5 844.5 L 1184.5 844.5 Z M 1184.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 938.5 228.5 L 979.5 228.5 L 979.5 502.5 L 938.5 502.5 Z M 1085.5 228.5 L 1127.5 228.5 L 1127.5 502.5 L 1085.5 502.5 Z M 1217.5 228.5 L 1258.5 228.5 L 1258.5 502.5 L 1217.5 502.5 Z M 1217.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hd__a211o_4.svg b/cells/a211o/sky130_fd_sc_hd__a211o_4.svg
index 1a46128..c84eee4 100644
--- a/cells/a211o/sky130_fd_sc_hd__a211o_4.svg
+++ b/cells/a211o/sky130_fd_sc_hd__a211o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 251.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1574.5 645.5 L 1608.5 645.5 L 1608.5 794.5 L 1574.5 794.5 Z M 399.5 645.5 L 434.5 645.5 L 434.5 794.5 L 399.5 794.5 Z M 498.5 645.5 L 533.5 645.5 L 533.5 794.5 L 498.5 794.5 Z M 597.5 645.5 L 632.5 645.5 L 632.5 794.5 L 597.5 794.5 Z M 700.5 645.5 L 734.5 645.5 L 734.5 794.5 L 700.5 794.5 Z M 800.5 645.5 L 834.5 645.5 L 834.5 794.5 L 800.5 794.5 Z M 908.5 645.5 L 942.5 645.5 L 942.5 794.5 L 908.5 794.5 Z M 1019.5 645.5 L 1054.5 645.5 L 1054.5 794.5 L 1019.5 794.5 Z M 1144.5 645.5 L 1178.5 645.5 L 1178.5 794.5 L 1144.5 794.5 Z M 1277.5 645.5 L 1312.5 645.5 L 1312.5 794.5 L 1277.5 794.5 Z M 1376.5 645.5 L 1410.5 645.5 L 1410.5 794.5 L 1376.5 794.5 Z M 1475.5 645.5 L 1509.5 645.5 L 1509.5 794.5 L 1475.5 794.5 Z M 1475.5 645.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1574.5 277.5 L 1608.5 277.5 L 1608.5 507.5 L 1574.5 507.5 Z M 309.5 277.5 L 343.5 277.5 L 343.5 507.5 L 309.5 507.5 Z M 407.5 277.5 L 442.5 277.5 L 442.5 507.5 L 407.5 507.5 Z M 506.5 277.5 L 541.5 277.5 L 541.5 507.5 L 506.5 507.5 Z M 605.5 277.5 L 640.5 277.5 L 640.5 507.5 L 605.5 507.5 Z M 822.5 277.5 L 856.5 277.5 L 856.5 507.5 L 822.5 507.5 Z M 920.5 277.5 L 955.5 277.5 L 955.5 507.5 L 920.5 507.5 Z M 1019.5 277.5 L 1054.5 277.5 L 1054.5 507.5 L 1019.5 507.5 Z M 1128.5 277.5 L 1162.5 277.5 L 1162.5 507.5 L 1128.5 507.5 Z M 1252.5 277.5 L 1286.5 277.5 L 1286.5 507.5 L 1252.5 507.5 Z M 1376.5 277.5 L 1410.5 277.5 L 1410.5 507.5 L 1376.5 507.5 Z M 1475.5 277.5 L 1509.5 277.5 L 1509.5 507.5 L 1475.5 507.5 Z M 1475.5 277.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 1416 524 L 1455 524 M 1416 485 L 1455 485 M 1416 485 L 1416 524 M 1455 485 L 1455 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1416 524 L 1455 524 M 1416 485 L 1455 485 M 1455 524 L 1455 485 M 1416 524 L 1416 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(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.svg b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.svg
index db1d80e..d374d59 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_1.svg
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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="#image386"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1095.5 666.5 L 1136.5 666.5 L 1136.5 844.5 L 1095.5 844.5 Z M 734.5 666.5 L 775.5 666.5 L 775.5 844.5 L 734.5 844.5 Z M 852.5 666.5 L 893.5 666.5 L 893.5 844.5 L 852.5 844.5 Z M 969.5 666.5 L 1010.5 666.5 L 1010.5 844.5 L 969.5 844.5 Z M 969.5 666.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image387"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1095.5 228.5 L 1136.5 228.5 L 1136.5 502.5 L 1095.5 502.5 Z M 734.5 228.5 L 775.5 228.5 L 775.5 502.5 L 734.5 502.5 Z M 852.5 228.5 L 893.5 228.5 L 893.5 502.5 L 852.5 502.5 Z M 969.5 228.5 L 1010.5 228.5 L 1010.5 502.5 L 969.5 502.5 Z M 969.5 228.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface383">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.svg b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.svg
index e376813..f571d41 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_2.svg
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 365.5 885.5 L 411.5 885.5 L 411.5 931.5 L 365.5 931.5 Z M 365.5 885.5 "/>
 </clipPath>
 <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="#image371"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1419.5 666.5 L 1460.5 666.5 L 1460.5 844.5 L 1419.5 844.5 Z M 454.5 666.5 L 495.5 666.5 L 495.5 844.5 L 454.5 844.5 Z M 571.5 666.5 L 612.5 666.5 L 612.5 844.5 L 571.5 844.5 Z M 689.5 666.5 L 730.5 666.5 L 730.5 844.5 L 689.5 844.5 Z M 806.5 666.5 L 848.5 666.5 L 848.5 844.5 L 806.5 844.5 Z M 1066.5 666.5 L 1107.5 666.5 L 1107.5 844.5 L 1066.5 844.5 Z M 1184.5 666.5 L 1225.5 666.5 L 1225.5 844.5 L 1184.5 844.5 Z M 1302.5 666.5 L 1343.5 666.5 L 1343.5 844.5 L 1302.5 844.5 Z M 1302.5 666.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image372"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1419.5 228.5 L 1460.5 228.5 L 1460.5 502.5 L 1419.5 502.5 Z M 454.5 228.5 L 495.5 228.5 L 495.5 502.5 L 454.5 502.5 Z M 571.5 228.5 L 612.5 228.5 L 612.5 502.5 L 571.5 502.5 Z M 689.5 228.5 L 730.5 228.5 L 730.5 502.5 L 689.5 502.5 Z M 806.5 228.5 L 848.5 228.5 L 848.5 502.5 L 806.5 502.5 Z M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 1184.5 228.5 L 1225.5 228.5 L 1225.5 502.5 L 1184.5 502.5 Z M 1302.5 228.5 L 1343.5 228.5 L 1343.5 502.5 L 1302.5 502.5 Z M 1302.5 228.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image373"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface340">
+<g id="surface368">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -192,6 +192,5 @@
 <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 365 194 L 411 194 M 365 148 L 411 148 M 365 148 L 365 194 M 411 148 L 411 194 " 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 365 194 L 411 194 M 365 148 L 411 148 M 411 194 L 411 148 M 365 194 L 365 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.svg b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.svg
index 378f70b..4da1524 100644
--- a/cells/a211oi/sky130_fd_sc_hd__a211oi_4.svg
+++ b/cells/a211oi/sky130_fd_sc_hd__a211oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1588.5 631.5 L 1618.5 631.5 L 1618.5 763.5 L 1588.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 803.5 631.5 L 834.5 631.5 L 834.5 763.5 L 803.5 763.5 Z M 888.5 631.5 L 919.5 631.5 L 919.5 763.5 L 888.5 763.5 Z M 974.5 631.5 L 1004.5 631.5 L 1004.5 763.5 L 974.5 763.5 Z M 1072.5 631.5 L 1102.5 631.5 L 1102.5 763.5 L 1072.5 763.5 Z M 1159.5 631.5 L 1190.5 631.5 L 1190.5 763.5 L 1159.5 763.5 Z M 1245.5 631.5 L 1276.5 631.5 L 1276.5 763.5 L 1245.5 763.5 Z M 1330.5 631.5 L 1361.5 631.5 L 1361.5 763.5 L 1330.5 763.5 Z M 1416.5 631.5 L 1446.5 631.5 L 1446.5 763.5 L 1416.5 763.5 Z M 1501.5 631.5 L 1531.5 631.5 L 1531.5 763.5 L 1501.5 763.5 Z M 1501.5 631.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 803.5 307.5 L 834.5 307.5 L 834.5 510.5 L 803.5 510.5 Z M 888.5 307.5 L 919.5 307.5 L 919.5 510.5 L 888.5 510.5 Z M 974.5 307.5 L 1004.5 307.5 L 1004.5 510.5 L 974.5 510.5 Z M 1059.5 307.5 L 1089.5 307.5 L 1089.5 510.5 L 1059.5 510.5 Z M 1144.5 307.5 L 1174.5 307.5 L 1174.5 510.5 L 1144.5 510.5 Z M 1235.5 307.5 L 1266.5 307.5 L 1266.5 510.5 L 1235.5 510.5 Z M 1322.5 307.5 L 1353.5 307.5 L 1353.5 510.5 L 1322.5 510.5 Z M 1410.5 307.5 L 1440.5 307.5 L 1440.5 510.5 L 1410.5 510.5 Z M 1501.5 307.5 L 1531.5 307.5 L 1531.5 510.5 L 1501.5 510.5 Z M 1501.5 307.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 989.5 483.5 L 1023.5 483.5 L 1023.5 518.5 L 989.5 518.5 Z M 1548.5 483.5 L 1583.5 483.5 L 1583.5 518.5 L 1548.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.svg b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.svg
index 6e68ba7..8ed3d63 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_1.svg
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" 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="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1057.5 666.5 L 1098.5 666.5 L 1098.5 844.5 L 1057.5 844.5 Z M 660.5 729.5 L 701.5 729.5 L 701.5 844.5 L 660.5 844.5 Z M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 939.5 666.5 L 980.5 666.5 L 980.5 844.5 L 939.5 844.5 Z M 824.5 666.5 L 865.5 666.5 L 865.5 844.5 L 824.5 844.5 Z M 824.5 666.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 607.5 228.5 L 607.5 343.5 L 566.5 343.5 Z M 1057.5 228.5 L 1098.5 228.5 L 1098.5 502.5 L 1057.5 502.5 Z M 824.5 228.5 L 865.5 228.5 L 865.5 502.5 L 824.5 502.5 Z M 939.5 228.5 L 980.5 228.5 L 980.5 502.5 L 939.5 502.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 1315.5 228.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface352">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -192,6 +192,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.svg b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.svg
index 458ddef..826d8cc 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_2.svg
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 823.5 666.5 L 864.5 666.5 L 864.5 781.5 L 823.5 781.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 683.5 666.5 L 724.5 666.5 L 724.5 844.5 L 683.5 844.5 Z M 1211.5 666.5 L 1252.5 666.5 L 1252.5 844.5 L 1211.5 844.5 Z M 1080.5 666.5 L 1121.5 666.5 L 1121.5 844.5 L 1080.5 844.5 Z M 1310.5 666.5 L 1351.5 666.5 L 1351.5 844.5 L 1310.5 844.5 Z M 1310.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 823.5 387.5 L 864.5 387.5 L 864.5 502.5 L 823.5 502.5 Z M 1195.5 228.5 L 1236.5 228.5 L 1236.5 502.5 L 1195.5 502.5 Z M 1080.5 228.5 L 1121.5 228.5 L 1121.5 502.5 L 1080.5 502.5 Z M 1310.5 228.5 L 1351.5 228.5 L 1351.5 502.5 L 1310.5 502.5 Z M 683.5 228.5 L 724.5 228.5 L 724.5 502.5 L 683.5 502.5 Z M 683.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.svg b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.svg
index e8ea10a..5ca06e2 100644
--- a/cells/a21bo/sky130_fd_sc_hd__a21bo_4.svg
+++ b/cells/a21bo/sky130_fd_sc_hd__a21bo_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image323" 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="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1547.5 653.5 L 1584.5 653.5 L 1584.5 813.5 L 1547.5 813.5 Z M 368.5 653.5 L 405.5 653.5 L 405.5 813.5 L 368.5 813.5 Z M 474.5 653.5 L 511.5 653.5 L 511.5 813.5 L 474.5 813.5 Z M 581.5 653.5 L 618.5 653.5 L 618.5 813.5 L 581.5 813.5 Z M 687.5 653.5 L 724.5 653.5 L 724.5 813.5 L 687.5 813.5 Z M 793.5 653.5 L 830.5 653.5 L 830.5 813.5 L 793.5 813.5 Z M 1029.5 653.5 L 1066.5 653.5 L 1066.5 813.5 L 1029.5 813.5 Z M 1133.5 653.5 L 1170.5 653.5 L 1170.5 813.5 L 1133.5 813.5 Z M 1246.5 653.5 L 1283.5 653.5 L 1283.5 813.5 L 1246.5 813.5 Z M 1340.5 653.5 L 1377.5 653.5 L 1377.5 813.5 L 1340.5 813.5 Z M 1444.5 653.5 L 1481.5 653.5 L 1481.5 813.5 L 1444.5 813.5 Z M 1444.5 653.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1547.5 258.5 L 1584.5 258.5 L 1584.5 505.5 L 1547.5 505.5 Z M 368.5 258.5 L 405.5 258.5 L 405.5 505.5 L 368.5 505.5 Z M 474.5 258.5 L 511.5 258.5 L 511.5 505.5 L 474.5 505.5 Z M 581.5 258.5 L 618.5 258.5 L 618.5 505.5 L 581.5 505.5 Z M 687.5 258.5 L 724.5 258.5 L 724.5 505.5 L 687.5 505.5 Z M 793.5 258.5 L 830.5 258.5 L 830.5 505.5 L 793.5 505.5 Z M 1029.5 258.5 L 1066.5 258.5 L 1066.5 505.5 L 1029.5 505.5 Z M 1133.5 258.5 L 1170.5 258.5 L 1170.5 505.5 L 1133.5 505.5 Z M 1237.5 258.5 L 1274.5 258.5 L 1274.5 505.5 L 1237.5 505.5 Z M 1340.5 258.5 L 1377.5 258.5 L 1377.5 505.5 L 1340.5 505.5 Z M 1444.5 258.5 L 1481.5 258.5 L 1481.5 505.5 L 1444.5 505.5 Z M 1444.5 258.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.svg b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.svg
index 26fcad4..f236287 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_0.svg
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1189.5 729.5 L 1230.5 729.5 L 1230.5 844.5 L 1189.5 844.5 Z M 694.5 729.5 L 735.5 729.5 L 735.5 844.5 L 694.5 844.5 Z M 905.5 729.5 L 946.5 729.5 L 946.5 844.5 L 905.5 844.5 Z M 1091.5 729.5 L 1132.5 729.5 L 1132.5 844.5 L 1091.5 844.5 Z M 1091.5 729.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 694.5 228.5 L 735.5 228.5 L 735.5 343.5 L 694.5 343.5 Z M 1072.5 228.5 L 1113.5 228.5 L 1113.5 403.5 L 1072.5 403.5 Z M 954.5 228.5 L 995.5 228.5 L 995.5 403.5 L 954.5 403.5 Z M 1189.5 228.5 L 1230.5 228.5 L 1230.5 403.5 L 1189.5 403.5 Z M 1189.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.svg b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.svg
index da6ad2e..3538648 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_1.svg
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" 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="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1187.5 666.5 L 1228.5 666.5 L 1228.5 844.5 L 1187.5 844.5 Z M 774.5 729.5 L 815.5 729.5 L 815.5 844.5 L 774.5 844.5 Z M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 908.5 666.5 L 949.5 666.5 L 949.5 844.5 L 908.5 844.5 Z M 908.5 666.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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 694.5 228.5 L 735.5 228.5 L 735.5 343.5 L 694.5 343.5 Z M 1072.5 228.5 L 1113.5 228.5 L 1113.5 502.5 L 1072.5 502.5 Z M 954.5 228.5 L 995.5 228.5 L 995.5 502.5 L 954.5 502.5 Z M 1189.5 228.5 L 1230.5 228.5 L 1230.5 502.5 L 1189.5 502.5 Z M 1189.5 228.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.svg b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.svg
index ccfd490..911c642 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_2.svg
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1225.5 666.5 L 1266.5 666.5 L 1266.5 844.5 L 1225.5 844.5 Z M 560.5 729.5 L 601.5 729.5 L 601.5 844.5 L 560.5 844.5 Z M 1343.5 666.5 L 1384.5 666.5 L 1384.5 844.5 L 1343.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1009.5 666.5 L 1050.5 666.5 L 1050.5 844.5 L 1009.5 844.5 Z M 878.5 666.5 L 919.5 666.5 L 919.5 844.5 L 878.5 844.5 Z M 763.5 666.5 L 804.5 666.5 L 804.5 844.5 L 763.5 844.5 Z M 763.5 666.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 504.5 276.5 L 545.5 276.5 L 545.5 391.5 L 504.5 391.5 Z M 878.5 228.5 L 919.5 228.5 L 919.5 502.5 L 878.5 502.5 Z M 1343.5 228.5 L 1384.5 228.5 L 1384.5 502.5 L 1343.5 502.5 Z M 1107.5 228.5 L 1148.5 228.5 L 1148.5 502.5 L 1107.5 502.5 Z M 992.5 228.5 L 1034.5 228.5 L 1034.5 502.5 L 992.5 502.5 Z M 1225.5 228.5 L 1266.5 228.5 L 1266.5 502.5 L 1225.5 502.5 Z M 763.5 228.5 L 804.5 228.5 L 804.5 502.5 L 763.5 502.5 Z M 763.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 819 334 L 865 334 M 819 287 L 865 287 M 819 287 L 819 334 M 865 287 L 865 334 " 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 819 334 L 865 334 M 819 287 L 865 287 M 865 334 L 865 287 M 819 334 L 819 287 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.svg b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.svg
index 4961a32..6eeb631 100644
--- a/cells/a21boi/sky130_fd_sc_hd__a21boi_4.svg
+++ b/cells/a21boi/sky130_fd_sc_hd__a21boi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 247.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1541.5 638.5 L 1573.5 638.5 L 1573.5 778.5 L 1541.5 778.5 Z M 334.5 638.5 L 366.5 638.5 L 366.5 778.5 L 334.5 778.5 Z M 448.5 638.5 L 480.5 638.5 L 480.5 778.5 L 448.5 778.5 Z M 541.5 638.5 L 573.5 638.5 L 573.5 778.5 L 541.5 778.5 Z M 633.5 638.5 L 666.5 638.5 L 666.5 778.5 L 633.5 778.5 Z M 726.5 638.5 L 758.5 638.5 L 758.5 778.5 L 726.5 778.5 Z M 892.5 638.5 L 924.5 638.5 L 924.5 778.5 L 892.5 778.5 Z M 985.5 638.5 L 1017.5 638.5 L 1017.5 778.5 L 985.5 778.5 Z M 1078.5 638.5 L 1110.5 638.5 L 1110.5 778.5 L 1078.5 778.5 Z M 1170.5 638.5 L 1203.5 638.5 L 1203.5 778.5 L 1170.5 778.5 Z M 1263.5 638.5 L 1295.5 638.5 L 1295.5 778.5 L 1263.5 778.5 Z M 1356.5 638.5 L 1388.5 638.5 L 1388.5 778.5 L 1356.5 778.5 Z M 1448.5 638.5 L 1481.5 638.5 L 1481.5 778.5 L 1448.5 778.5 Z M 1448.5 638.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1541.5 293.5 L 1573.5 293.5 L 1573.5 508.5 L 1541.5 508.5 Z M 308.5 293.5 L 340.5 293.5 L 340.5 508.5 L 308.5 508.5 Z M 513.5 293.5 L 545.5 293.5 L 545.5 508.5 L 513.5 508.5 Z M 605.5 293.5 L 638.5 293.5 L 638.5 508.5 L 605.5 508.5 Z M 698.5 293.5 L 730.5 293.5 L 730.5 508.5 L 698.5 508.5 Z M 791.5 293.5 L 823.5 293.5 L 823.5 508.5 L 791.5 508.5 Z M 890.5 293.5 L 922.5 293.5 L 922.5 508.5 L 890.5 508.5 Z M 985.5 293.5 L 1017.5 293.5 L 1017.5 508.5 L 985.5 508.5 Z M 1078.5 293.5 L 1110.5 293.5 L 1110.5 508.5 L 1078.5 508.5 Z M 1170.5 293.5 L 1203.5 293.5 L 1203.5 508.5 L 1170.5 508.5 Z M 1263.5 293.5 L 1295.5 293.5 L 1295.5 508.5 L 1263.5 508.5 Z M 1356.5 293.5 L 1388.5 293.5 L 1388.5 508.5 L 1356.5 508.5 Z M 1448.5 293.5 L 1481.5 293.5 L 1481.5 508.5 L 1448.5 508.5 Z M 1448.5 293.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 247 855 L 283 855 M 247 819 L 283 819 M 247 819 L 247 855 M 283 819 L 283 855 " 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 247 855 L 283 855 M 247 819 L 283 819 M 283 855 L 283 819 M 247 855 L 247 819 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_1.svg b/cells/a21o/sky130_fd_sc_hd__a21o_1.svg
index e8bdc01..1fa7dbb 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_1.svg
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1187.5 666.5 L 1228.5 666.5 L 1228.5 844.5 L 1187.5 844.5 Z M 696.5 666.5 L 737.5 666.5 L 737.5 844.5 L 696.5 844.5 Z M 953.5 666.5 L 994.5 666.5 L 994.5 844.5 L 953.5 844.5 Z M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 1069.5 666.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1187.5 228.5 L 1228.5 228.5 L 1228.5 502.5 L 1187.5 502.5 Z M 696.5 228.5 L 737.5 228.5 L 737.5 502.5 L 696.5 502.5 Z M 953.5 228.5 L 994.5 228.5 L 994.5 502.5 L 953.5 502.5 Z M 1069.5 228.5 L 1110.5 228.5 L 1110.5 502.5 L 1069.5 502.5 Z M 1069.5 228.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_2.svg b/cells/a21o/sky130_fd_sc_hd__a21o_2.svg
index 73b4731..6eb025f 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_2.svg
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1252.5 666.5 L 1293.5 666.5 L 1293.5 844.5 L 1252.5 844.5 Z M 678.5 666.5 L 719.5 666.5 L 719.5 844.5 L 678.5 844.5 Z M 796.5 666.5 L 837.5 666.5 L 837.5 844.5 L 796.5 844.5 Z M 930.5 666.5 L 971.5 666.5 L 971.5 844.5 L 930.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1107.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 631.5 228.5 L 672.5 228.5 L 672.5 502.5 L 631.5 502.5 Z M 749.5 228.5 L 790.5 228.5 L 790.5 502.5 L 749.5 502.5 Z M 1009.5 228.5 L 1050.5 228.5 L 1050.5 502.5 L 1009.5 502.5 Z M 1127.5 228.5 L 1168.5 228.5 L 1168.5 502.5 L 1127.5 502.5 Z M 1127.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hd__a21o_4.svg b/cells/a21o/sky130_fd_sc_hd__a21o_4.svg
index 42cbb5e..253dfa6 100644
--- a/cells/a21o/sky130_fd_sc_hd__a21o_4.svg
+++ b/cells/a21o/sky130_fd_sc_hd__a21o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image315" 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="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <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="#image315"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1496.5 662.5 L 1536.5 662.5 L 1536.5 835.5 L 1496.5 835.5 Z M 337.5 662.5 L 377.5 662.5 L 377.5 835.5 L 337.5 835.5 Z M 452.5 662.5 L 492.5 662.5 L 492.5 835.5 L 452.5 835.5 Z M 566.5 662.5 L 606.5 662.5 L 606.5 835.5 L 566.5 835.5 Z M 681.5 662.5 L 720.5 662.5 L 720.5 835.5 L 681.5 835.5 Z M 937.5 662.5 L 977.5 662.5 L 977.5 835.5 L 937.5 835.5 Z M 1049.5 662.5 L 1089.5 662.5 L 1089.5 835.5 L 1049.5 835.5 Z M 1171.5 662.5 L 1211.5 662.5 L 1211.5 835.5 L 1171.5 835.5 Z M 1272.5 662.5 L 1312.5 662.5 L 1312.5 835.5 L 1272.5 835.5 Z M 1384.5 662.5 L 1424.5 662.5 L 1424.5 835.5 L 1384.5 835.5 Z M 1384.5 662.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image316"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1496.5 237.5 L 1536.5 237.5 L 1536.5 503.5 L 1496.5 503.5 Z M 337.5 237.5 L 377.5 237.5 L 377.5 503.5 L 337.5 503.5 Z M 452.5 237.5 L 492.5 237.5 L 492.5 503.5 L 452.5 503.5 Z M 566.5 237.5 L 606.5 237.5 L 606.5 503.5 L 566.5 503.5 Z M 681.5 237.5 L 720.5 237.5 L 720.5 503.5 L 681.5 503.5 Z M 937.5 237.5 L 977.5 237.5 L 977.5 503.5 L 937.5 503.5 Z M 1049.5 237.5 L 1089.5 237.5 L 1089.5 503.5 L 1049.5 503.5 Z M 1161.5 237.5 L 1201.5 237.5 L 1201.5 503.5 L 1161.5 503.5 Z M 1272.5 237.5 L 1312.5 237.5 L 1312.5 503.5 L 1272.5 503.5 Z M 1384.5 237.5 L 1424.5 237.5 L 1424.5 503.5 L 1384.5 503.5 Z M 1384.5 237.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.svg b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.svg
index abca663..40320a1 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_1.svg
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1065.5 666.5 L 1106.5 666.5 L 1106.5 844.5 L 1065.5 844.5 Z M 826.5 666.5 L 867.5 666.5 L 867.5 844.5 L 826.5 844.5 Z M 943.5 666.5 L 984.5 666.5 L 984.5 844.5 L 943.5 844.5 Z M 943.5 666.5 "/>
 </clipPath>
-<image id="image308" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1065.5 228.5 L 1106.5 228.5 L 1106.5 502.5 L 1065.5 502.5 Z M 826.5 228.5 L 867.5 228.5 L 867.5 502.5 L 826.5 502.5 Z M 943.5 228.5 L 984.5 228.5 L 984.5 502.5 L 943.5 502.5 Z M 943.5 228.5 "/>
 </clipPath>
-<image id="image309" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image310" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.svg b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.svg
index 951d42f..37226e4 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_2.svg
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1215.5 666.5 L 1256.5 666.5 L 1256.5 844.5 L 1215.5 844.5 Z M 637.5 666.5 L 678.5 666.5 L 678.5 844.5 L 637.5 844.5 Z M 753.5 666.5 L 794.5 666.5 L 794.5 844.5 L 753.5 844.5 Z M 871.5 666.5 L 912.5 666.5 L 912.5 844.5 L 871.5 844.5 Z M 969.5 666.5 L 1010.5 666.5 L 1010.5 844.5 L 969.5 844.5 Z M 1101.5 666.5 L 1142.5 666.5 L 1142.5 844.5 L 1101.5 844.5 Z M 1101.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1215.5 228.5 L 1256.5 228.5 L 1256.5 502.5 L 1215.5 502.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 753.5 228.5 L 794.5 228.5 L 794.5 502.5 L 753.5 502.5 Z M 871.5 228.5 L 912.5 228.5 L 912.5 502.5 L 871.5 502.5 Z M 986.5 228.5 L 1027.5 228.5 L 1027.5 502.5 L 986.5 502.5 Z M 1101.5 228.5 L 1142.5 228.5 L 1142.5 502.5 L 1101.5 502.5 Z M 1101.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image295" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.svg b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.svg
index c4adb3b..0525a0f 100644
--- a/cells/a21oi/sky130_fd_sc_hd__a21oi_4.svg
+++ b/cells/a21oi/sky130_fd_sc_hd__a21oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1497.5 653.5 L 1534.5 653.5 L 1534.5 813.5 L 1497.5 813.5 Z M 320.5 653.5 L 357.5 653.5 L 357.5 813.5 L 320.5 813.5 Z M 426.5 653.5 L 463.5 653.5 L 463.5 813.5 L 426.5 813.5 Z M 532.5 653.5 L 569.5 653.5 L 569.5 813.5 L 532.5 813.5 Z M 638.5 653.5 L 675.5 653.5 L 675.5 813.5 L 638.5 813.5 Z M 754.5 653.5 L 791.5 653.5 L 791.5 813.5 L 754.5 813.5 Z M 860.5 653.5 L 897.5 653.5 L 897.5 813.5 L 860.5 813.5 Z M 967.5 653.5 L 1003.5 653.5 L 1003.5 813.5 L 967.5 813.5 Z M 1073.5 653.5 L 1110.5 653.5 L 1110.5 813.5 L 1073.5 813.5 Z M 1179.5 653.5 L 1216.5 653.5 L 1216.5 813.5 L 1179.5 813.5 Z M 1285.5 653.5 L 1322.5 653.5 L 1322.5 813.5 L 1285.5 813.5 Z M 1391.5 653.5 L 1428.5 653.5 L 1428.5 813.5 L 1391.5 813.5 Z M 1391.5 653.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1497.5 258.5 L 1534.5 258.5 L 1534.5 505.5 L 1497.5 505.5 Z M 320.5 258.5 L 357.5 258.5 L 357.5 505.5 L 320.5 505.5 Z M 426.5 258.5 L 463.5 258.5 L 463.5 505.5 L 426.5 505.5 Z M 532.5 258.5 L 569.5 258.5 L 569.5 505.5 L 532.5 505.5 Z M 638.5 258.5 L 675.5 258.5 L 675.5 505.5 L 638.5 505.5 Z M 752.5 258.5 L 789.5 258.5 L 789.5 505.5 L 752.5 505.5 Z M 860.5 258.5 L 897.5 258.5 L 897.5 505.5 L 860.5 505.5 Z M 967.5 258.5 L 1003.5 258.5 L 1003.5 505.5 L 967.5 505.5 Z M 1073.5 258.5 L 1110.5 258.5 L 1110.5 505.5 L 1073.5 505.5 Z M 1179.5 258.5 L 1216.5 258.5 L 1216.5 505.5 L 1179.5 505.5 Z M 1285.5 258.5 L 1322.5 258.5 L 1322.5 505.5 L 1285.5 505.5 Z M 1391.5 258.5 L 1428.5 258.5 L 1428.5 505.5 L 1391.5 505.5 Z M 1391.5 258.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_1.svg b/cells/a221o/sky130_fd_sc_hd__a221o_1.svg
index 53e9ca6..be5e823 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_1.svg
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" 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="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1311.5 666.5 L 1352.5 666.5 L 1352.5 844.5 L 1311.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 697.5 666.5 L 738.5 666.5 L 738.5 844.5 L 697.5 844.5 Z M 796.5 666.5 L 837.5 666.5 L 837.5 844.5 L 796.5 844.5 Z M 1053.5 666.5 L 1094.5 666.5 L 1094.5 844.5 L 1053.5 844.5 Z M 1184.5 666.5 L 1225.5 666.5 L 1225.5 844.5 L 1184.5 844.5 Z M 1184.5 666.5 "/>
 </clipPath>
-<image id="image337" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1311.5 228.5 L 1352.5 228.5 L 1352.5 502.5 L 1311.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 796.5 228.5 L 837.5 228.5 L 837.5 502.5 L 796.5 502.5 Z M 1053.5 228.5 L 1094.5 228.5 L 1094.5 502.5 L 1053.5 502.5 Z M 1184.5 228.5 L 1225.5 228.5 L 1225.5 502.5 L 1184.5 502.5 Z M 1184.5 228.5 "/>
 </clipPath>
-<image id="image338" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image339" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_2.svg b/cells/a221o/sky130_fd_sc_hd__a221o_2.svg
index 76ef699..9536d4e 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_2.svg
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" 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="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1363.5 666.5 L 1404.5 666.5 L 1404.5 844.5 L 1363.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 634.5 666.5 L 675.5 666.5 L 675.5 844.5 L 634.5 844.5 Z M 733.5 666.5 L 774.5 666.5 L 774.5 844.5 L 733.5 844.5 Z M 990.5 666.5 L 1031.5 666.5 L 1031.5 844.5 L 990.5 844.5 Z M 1121.5 666.5 L 1162.5 666.5 L 1162.5 844.5 L 1121.5 844.5 Z M 1248.5 666.5 L 1289.5 666.5 L 1289.5 844.5 L 1248.5 844.5 Z M 1248.5 666.5 "/>
 </clipPath>
-<image id="image337" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1363.5 228.5 L 1404.5 228.5 L 1404.5 502.5 L 1363.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 733.5 228.5 L 774.5 228.5 L 774.5 502.5 L 733.5 502.5 Z M 990.5 228.5 L 1031.5 228.5 L 1031.5 502.5 L 990.5 502.5 Z M 1121.5 228.5 L 1162.5 228.5 L 1162.5 502.5 L 1121.5 502.5 Z M 1248.5 228.5 L 1289.5 228.5 L 1289.5 502.5 L 1248.5 502.5 Z M 1248.5 228.5 "/>
 </clipPath>
-<image id="image338" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image339" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hd__a221o_4.svg b/cells/a221o/sky130_fd_sc_hd__a221o_4.svg
index 13522b9..cff3f12 100644
--- a/cells/a221o/sky130_fd_sc_hd__a221o_4.svg
+++ b/cells/a221o/sky130_fd_sc_hd__a221o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 240.5 779.5 L 273.5 779.5 L 273.5 811.5 L 240.5 811.5 Z M 240.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1530.5 626.5 L 1559.5 626.5 L 1559.5 750.5 L 1530.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 608.5 626.5 L 636.5 626.5 L 636.5 750.5 L 608.5 750.5 Z M 688.5 626.5 L 717.5 626.5 L 717.5 750.5 L 688.5 750.5 Z M 868.5 626.5 L 897.5 626.5 L 897.5 750.5 L 868.5 750.5 Z M 948.5 626.5 L 977.5 626.5 L 977.5 750.5 L 948.5 750.5 Z M 1029.5 626.5 L 1057.5 626.5 L 1057.5 750.5 L 1029.5 750.5 Z M 1109.5 626.5 L 1138.5 626.5 L 1138.5 750.5 L 1109.5 750.5 Z M 1189.5 626.5 L 1218.5 626.5 L 1218.5 750.5 L 1189.5 750.5 Z M 1270.5 626.5 L 1298.5 626.5 L 1298.5 750.5 L 1270.5 750.5 Z M 1450.5 626.5 L 1478.5 626.5 L 1478.5 750.5 L 1450.5 750.5 Z M 1450.5 626.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1513.5 320.5 L 1541.5 320.5 L 1541.5 511.5 L 1513.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 688.5 320.5 L 717.5 320.5 L 717.5 511.5 L 688.5 511.5 Z M 768.5 320.5 L 797.5 320.5 L 797.5 511.5 L 768.5 511.5 Z M 850.5 320.5 L 878.5 320.5 L 878.5 511.5 L 850.5 511.5 Z M 1031.5 320.5 L 1059.5 320.5 L 1059.5 511.5 L 1031.5 511.5 Z M 1111.5 320.5 L 1140.5 320.5 L 1140.5 511.5 L 1111.5 511.5 Z M 1191.5 320.5 L 1220.5 320.5 L 1220.5 511.5 L 1191.5 511.5 Z M 1272.5 320.5 L 1300.5 320.5 L 1300.5 511.5 L 1272.5 511.5 Z M 1432.5 320.5 L 1461.5 320.5 L 1461.5 511.5 L 1432.5 511.5 Z M 1432.5 320.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 592.5 616.5 L 625.5 616.5 L 625.5 649.5 L 592.5 649.5 Z M 861.5 616.5 L 894.5 616.5 L 894.5 649.5 L 861.5 649.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 240 300 L 273 300 M 240 268 L 273 268 M 240 268 L 240 300 M 273 268 L 273 300 " 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 240 300 L 273 300 M 240 268 L 273 268 M 273 300 L 273 268 M 240 300 L 240 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 240 593 L 273 593 M 240 560 L 273 560 M 240 560 L 240 593 M 273 560 L 273 593 M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.svg b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.svg
index 77408bb..38322b7 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_1.svg
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image344" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1241.5 666.5 L 1282.5 666.5 L 1282.5 844.5 L 1241.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 760.5 666.5 L 801.5 666.5 L 801.5 844.5 L 760.5 844.5 Z M 860.5 666.5 L 901.5 666.5 L 901.5 844.5 L 860.5 844.5 Z M 1117.5 666.5 L 1158.5 666.5 L 1158.5 844.5 L 1117.5 844.5 Z M 1117.5 666.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1241.5 228.5 L 1282.5 228.5 L 1282.5 502.5 L 1241.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 860.5 228.5 L 901.5 228.5 L 901.5 502.5 L 860.5 502.5 Z M 1117.5 228.5 L 1158.5 228.5 L 1158.5 502.5 L 1117.5 502.5 Z M 1117.5 228.5 "/>
 </clipPath>
-<image id="image318" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.svg b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.svg
index 0e177ba..5c24f5c 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_2.svg
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1498.5 662.5 L 1538.5 662.5 L 1538.5 835.5 L 1498.5 835.5 Z M 334.5 662.5 L 373.5 662.5 L 373.5 835.5 L 334.5 835.5 Z M 445.5 662.5 L 485.5 662.5 L 485.5 835.5 L 445.5 835.5 Z M 695.5 662.5 L 735.5 662.5 L 735.5 835.5 L 695.5 835.5 Z M 807.5 662.5 L 847.5 662.5 L 847.5 835.5 L 807.5 835.5 Z M 919.5 662.5 L 959.5 662.5 L 959.5 835.5 L 919.5 835.5 Z M 1030.5 662.5 L 1070.5 662.5 L 1070.5 835.5 L 1030.5 835.5 Z M 1163.5 662.5 L 1203.5 662.5 L 1203.5 835.5 L 1163.5 835.5 Z M 1275.5 662.5 L 1315.5 662.5 L 1315.5 835.5 L 1275.5 835.5 Z M 1387.5 662.5 L 1427.5 662.5 L 1427.5 835.5 L 1387.5 835.5 Z M 1387.5 662.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1498.5 237.5 L 1538.5 237.5 L 1538.5 503.5 L 1498.5 503.5 Z M 334.5 237.5 L 373.5 237.5 L 373.5 503.5 L 334.5 503.5 Z M 445.5 237.5 L 485.5 237.5 L 485.5 503.5 L 445.5 503.5 Z M 695.5 237.5 L 735.5 237.5 L 735.5 503.5 L 695.5 503.5 Z M 807.5 237.5 L 847.5 237.5 L 847.5 503.5 L 807.5 503.5 Z M 919.5 237.5 L 959.5 237.5 L 959.5 503.5 L 919.5 503.5 Z M 1030.5 237.5 L 1070.5 237.5 L 1070.5 503.5 L 1030.5 503.5 Z M 1163.5 237.5 L 1203.5 237.5 L 1203.5 503.5 L 1163.5 503.5 Z M 1275.5 237.5 L 1315.5 237.5 L 1315.5 503.5 L 1275.5 503.5 Z M 1387.5 237.5 L 1427.5 237.5 L 1427.5 503.5 L 1387.5 503.5 Z M 1387.5 237.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 388 340 L 433 340 M 388 294 L 433 294 M 388 294 L 388 340 M 433 294 L 433 340 M 388 430 L 433 430 M 388 385 L 433 385 M 388 385 L 388 430 M 433 385 L 433 430 M 388 611 L 433 611 M 388 566 L 433 566 M 388 566 L 388 611 M 433 566 L 433 611 M 388 701 L 433 701 M 388 656 L 433 656 M 388 656 L 388 701 M 433 656 L 433 701 M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.svg b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.svg
index 4e94562..1822e18 100644
--- a/cells/a221oi/sky130_fd_sc_hd__a221oi_4.svg
+++ b/cells/a221oi/sky130_fd_sc_hd__a221oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" 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="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1610.5 609.5 L 1633.5 609.5 L 1633.5 710.5 L 1610.5 710.5 Z M 268.5 609.5 L 292.5 609.5 L 292.5 710.5 L 268.5 710.5 Z M 334.5 609.5 L 357.5 609.5 L 357.5 710.5 L 334.5 710.5 Z M 400.5 609.5 L 423.5 609.5 L 423.5 710.5 L 400.5 710.5 Z M 465.5 609.5 L 489.5 609.5 L 489.5 710.5 L 465.5 710.5 Z M 534.5 609.5 L 558.5 609.5 L 558.5 710.5 L 534.5 710.5 Z M 600.5 609.5 L 623.5 609.5 L 623.5 710.5 L 600.5 710.5 Z M 666.5 609.5 L 689.5 609.5 L 689.5 710.5 L 666.5 710.5 Z M 809.5 609.5 L 833.5 609.5 L 833.5 710.5 L 809.5 710.5 Z M 875.5 609.5 L 898.5 609.5 L 898.5 710.5 L 875.5 710.5 Z M 941.5 609.5 L 964.5 609.5 L 964.5 710.5 L 941.5 710.5 Z M 1006.5 609.5 L 1030.5 609.5 L 1030.5 710.5 L 1006.5 710.5 Z M 1072.5 609.5 L 1095.5 609.5 L 1095.5 710.5 L 1072.5 710.5 Z M 1150.5 609.5 L 1174.5 609.5 L 1174.5 710.5 L 1150.5 710.5 Z M 1216.5 609.5 L 1239.5 609.5 L 1239.5 710.5 L 1216.5 710.5 Z M 1282.5 609.5 L 1305.5 609.5 L 1305.5 710.5 L 1282.5 710.5 Z M 1347.5 609.5 L 1371.5 609.5 L 1371.5 710.5 L 1347.5 710.5 Z M 1413.5 609.5 L 1436.5 609.5 L 1436.5 710.5 L 1413.5 710.5 Z M 1479.5 609.5 L 1502.5 609.5 L 1502.5 710.5 L 1479.5 710.5 Z M 1544.5 609.5 L 1568.5 609.5 L 1568.5 710.5 L 1544.5 710.5 Z M 1544.5 609.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 358.5 L 1633.5 358.5 L 1633.5 515.5 L 1610.5 515.5 Z M 268.5 358.5 L 292.5 358.5 L 292.5 515.5 L 268.5 515.5 Z M 334.5 358.5 L 357.5 358.5 L 357.5 515.5 L 334.5 515.5 Z M 400.5 358.5 L 423.5 358.5 L 423.5 515.5 L 400.5 515.5 Z M 465.5 358.5 L 489.5 358.5 L 489.5 515.5 L 465.5 515.5 Z M 612.5 358.5 L 636.5 358.5 L 636.5 515.5 L 612.5 515.5 Z M 678.5 358.5 L 701.5 358.5 L 701.5 515.5 L 678.5 515.5 Z M 744.5 358.5 L 767.5 358.5 L 767.5 515.5 L 744.5 515.5 Z M 809.5 358.5 L 833.5 358.5 L 833.5 515.5 L 809.5 515.5 Z M 875.5 358.5 L 898.5 358.5 L 898.5 515.5 L 875.5 515.5 Z M 941.5 358.5 L 964.5 358.5 L 964.5 515.5 L 941.5 515.5 Z M 1006.5 358.5 L 1030.5 358.5 L 1030.5 515.5 L 1006.5 515.5 Z M 1072.5 358.5 L 1095.5 358.5 L 1095.5 515.5 L 1072.5 515.5 Z M 1150.5 358.5 L 1174.5 358.5 L 1174.5 515.5 L 1150.5 515.5 Z M 1216.5 358.5 L 1239.5 358.5 L 1239.5 515.5 L 1216.5 515.5 Z M 1282.5 358.5 L 1305.5 358.5 L 1305.5 515.5 L 1282.5 515.5 Z M 1347.5 358.5 L 1371.5 358.5 L 1371.5 515.5 L 1347.5 515.5 Z M 1413.5 358.5 L 1436.5 358.5 L 1436.5 515.5 L 1413.5 515.5 Z M 1479.5 358.5 L 1502.5 358.5 L 1502.5 515.5 L 1479.5 515.5 Z M 1544.5 358.5 L 1568.5 358.5 L 1568.5 515.5 L 1544.5 515.5 Z M 1544.5 358.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 227 345 L 253 345 M 227 319 L 253 319 M 227 319 L 227 345 M 253 319 L 253 345 " 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 227 345 L 253 345 M 227 319 L 253 319 M 253 345 L 253 319 M 227 345 L 227 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.svg b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.svg
index 9ac5d00..cae5695 100644
--- a/cells/a222oi/sky130_fd_sc_hd__a222oi_1.svg
+++ b/cells/a222oi/sky130_fd_sc_hd__a222oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image304" 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="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 458.5 842.5 L 1464.5 842.5 L 1464.5 908.5 L 458.5 908.5 Z M 458.5 842.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 669.5 L 1356.5 669.5 L 1356.5 844.5 L 1315.5 844.5 Z M 566.5 669.5 L 607.5 669.5 L 607.5 844.5 L 566.5 844.5 Z M 664.5 669.5 L 705.5 669.5 L 705.5 844.5 L 664.5 844.5 Z M 954.5 669.5 L 995.5 669.5 L 995.5 844.5 L 954.5 844.5 Z M 1053.5 669.5 L 1094.5 669.5 L 1094.5 844.5 L 1053.5 844.5 Z M 1184.5 669.5 L 1225.5 669.5 L 1225.5 844.5 L 1184.5 844.5 Z M 1184.5 669.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 954.5 228.5 L 995.5 228.5 L 995.5 502.5 L 954.5 502.5 Z M 1069.5 228.5 L 1110.5 228.5 L 1110.5 502.5 L 1069.5 502.5 Z M 1184.5 228.5 L 1225.5 228.5 L 1225.5 502.5 L 1184.5 502.5 Z M 1184.5 228.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,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 972.742188 578.835938 L 973.394531 572.734375 L 975.101562 567.773438 L 977.789062 563.867188 L 981.449219 561.101562 L 986.085938 559.394531 L 991.777344 558.824219 L 994.382812 558.988281 L 996.902344 559.394531 L 999.261719 560.046875 L 1001.378906 561.023438 L 1003.332031 562.242188 L 1005.203125 563.625 L 1006.664062 565.332031 L 1007.96875 567.121094 L 1008.941406 569.074219 L 1009.675781 571.109375 L 1010.082031 573.386719 L 1010.246094 575.746094 L 1009.917969 579.082031 L 1009.023438 582.171875 L 1007.480469 585.019531 L 1005.363281 587.703125 L 1002.597656 590.226562 L 999.261719 592.421875 L 998.042969 593.152344 L 989.90625 597.546875 L 987.792969 598.765625 L 985.921875 599.988281 L 984.296875 601.207031 L 982.992188 602.425781 L 981.855469 603.648438 L 981.042969 604.867188 L 980.632812 605.597656 L 980.308594 606.25 L 980.066406 607.0625 L 979.820312 607.796875 L 979.578125 608.609375 L 979.496094 609.421875 L 1009.839844 609.421875 L 1009.839844 616.5 L 971.441406 616.5 L 971.605469 613.652344 L 972.011719 611.050781 L 972.5 608.609375 L 973.152344 606.496094 L 973.882812 604.460938 L 974.777344 602.671875 L 975.753906 601.125 L 976.972656 599.578125 L 978.4375 598.035156 L 980.066406 596.570312 L 981.9375 595.105469 L 984.132812 593.640625 L 984.621094 593.316406 L 985.191406 592.992188 L 985.757812 592.585938 L 986.328125 592.257812 L 986.980469 591.933594 L 987.628906 591.527344 L 995.113281 587.296875 L 997.472656 585.75 L 999.425781 584.042969 L 1000.972656 582.253906 L 1002.027344 580.300781 L 1002.679688 578.1875 L 1002.921875 575.90625 L 1002.761719 574.363281 L 1002.515625 572.816406 L 1001.949219 571.433594 L 1001.296875 570.132812 L 1000.320312 568.992188 L 999.261719 567.855469 L 998.125 567.042969 L 996.984375 566.308594 L 995.683594 565.820312 L 994.382812 565.414062 L 993 565.171875 L 991.535156 565.089844 L 988.363281 565.496094 L 985.679688 566.472656 L 983.480469 568.179688 L 981.855469 570.539062 L 980.714844 573.628906 L 980.066406 577.292969 L 979.984375 577.617188 L 979.984375 578.105469 L 979.902344 578.347656 L 979.902344 578.835938 Z M 972.742188 578.835938 "/>
 <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 938 516 L 984 516 M 938 469 L 984 469 M 938 469 L 938 516 M 984 469 L 984 516 " 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 938 516 L 984 516 M 938 469 L 984 469 M 984 516 L 984 469 M 938 516 L 938 469 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_1.svg b/cells/a22o/sky130_fd_sc_hd__a22o_1.svg
index 4e28589..438f170 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_1.svg
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 734.5 666.5 L 775.5 666.5 L 775.5 844.5 L 734.5 844.5 Z M 991.5 666.5 L 1032.5 666.5 L 1032.5 844.5 L 991.5 844.5 Z M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 1128.5 666.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 999.5 228.5 L 1040.5 228.5 L 1040.5 502.5 L 999.5 502.5 Z M 1128.5 228.5 L 1169.5 228.5 L 1169.5 502.5 L 1128.5 502.5 Z M 1128.5 228.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_2.svg b/cells/a22o/sky130_fd_sc_hd__a22o_2.svg
index 4f6d320..b1cfc47 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_2.svg
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1311.5 666.5 L 1352.5 666.5 L 1352.5 844.5 L 1311.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 670.5 666.5 L 711.5 666.5 L 711.5 844.5 L 670.5 844.5 Z M 938.5 666.5 L 979.5 666.5 L 979.5 844.5 L 938.5 844.5 Z M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 1196.5 666.5 L 1237.5 666.5 L 1237.5 844.5 L 1196.5 844.5 Z M 1196.5 666.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1311.5 228.5 L 1352.5 228.5 L 1352.5 502.5 L 1311.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 938.5 228.5 L 979.5 228.5 L 979.5 502.5 L 938.5 502.5 Z M 1069.5 228.5 L 1110.5 228.5 L 1110.5 502.5 L 1069.5 502.5 Z M 1196.5 228.5 L 1237.5 228.5 L 1237.5 502.5 L 1196.5 502.5 Z M 1196.5 228.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hd__a22o_4.svg b/cells/a22o/sky130_fd_sc_hd__a22o_4.svg
index 611ee46..e993965 100644
--- a/cells/a22o/sky130_fd_sc_hd__a22o_4.svg
+++ b/cells/a22o/sky130_fd_sc_hd__a22o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 251.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1529.5 645.5 L 1563.5 645.5 L 1563.5 794.5 L 1529.5 794.5 Z M 328.5 645.5 L 363.5 645.5 L 363.5 794.5 L 328.5 794.5 Z M 425.5 645.5 L 459.5 645.5 L 459.5 794.5 L 425.5 794.5 Z M 521.5 645.5 L 556.5 645.5 L 556.5 794.5 L 521.5 794.5 Z M 618.5 645.5 L 652.5 645.5 L 652.5 794.5 L 618.5 794.5 Z M 834.5 645.5 L 869.5 645.5 L 869.5 794.5 L 834.5 794.5 Z M 931.5 645.5 L 965.5 645.5 L 965.5 794.5 L 931.5 794.5 Z M 1027.5 645.5 L 1062.5 645.5 L 1062.5 794.5 L 1027.5 794.5 Z M 1124.5 645.5 L 1159.5 645.5 L 1159.5 794.5 L 1124.5 794.5 Z M 1239.5 645.5 L 1274.5 645.5 L 1274.5 794.5 L 1239.5 794.5 Z M 1336.5 645.5 L 1370.5 645.5 L 1370.5 794.5 L 1336.5 794.5 Z M 1432.5 645.5 L 1467.5 645.5 L 1467.5 794.5 L 1432.5 794.5 Z M 1432.5 645.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1529.5 277.5 L 1563.5 277.5 L 1563.5 507.5 L 1529.5 507.5 Z M 328.5 277.5 L 363.5 277.5 L 363.5 507.5 L 328.5 507.5 Z M 425.5 277.5 L 459.5 277.5 L 459.5 507.5 L 425.5 507.5 Z M 521.5 277.5 L 556.5 277.5 L 556.5 507.5 L 521.5 507.5 Z M 618.5 277.5 L 652.5 277.5 L 652.5 507.5 L 618.5 507.5 Z M 834.5 277.5 L 869.5 277.5 L 869.5 507.5 L 834.5 507.5 Z M 931.5 277.5 L 965.5 277.5 L 965.5 507.5 L 931.5 507.5 Z M 1027.5 277.5 L 1062.5 277.5 L 1062.5 507.5 L 1027.5 507.5 Z M 1124.5 277.5 L 1159.5 277.5 L 1159.5 507.5 L 1124.5 507.5 Z M 1239.5 277.5 L 1274.5 277.5 L 1274.5 507.5 L 1239.5 507.5 Z M 1336.5 277.5 L 1370.5 277.5 L 1370.5 507.5 L 1336.5 507.5 Z M 1432.5 277.5 L 1467.5 277.5 L 1467.5 507.5 L 1432.5 507.5 Z M 1432.5 277.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 251 876 L 290 876 M 251 837 L 290 837 M 251 837 L 251 876 M 290 837 L 290 876 " 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 251 876 L 290 876 M 251 837 L 290 837 M 290 876 L 290 837 M 251 876 L 251 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.svg b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.svg
index 5c90ed6..8a270b2 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_1.svg
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1163.5 666.5 L 1204.5 666.5 L 1204.5 844.5 L 1163.5 844.5 Z M 693.5 666.5 L 734.5 666.5 L 734.5 844.5 L 693.5 844.5 Z M 797.5 666.5 L 838.5 666.5 L 838.5 844.5 L 797.5 844.5 Z M 1065.5 666.5 L 1106.5 666.5 L 1106.5 844.5 L 1065.5 844.5 Z M 1065.5 666.5 "/>
 </clipPath>
-<image id="image308" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1180.5 228.5 L 1221.5 228.5 L 1221.5 502.5 L 1180.5 502.5 Z M 693.5 228.5 L 734.5 228.5 L 734.5 502.5 L 693.5 502.5 Z M 808.5 228.5 L 849.5 228.5 L 849.5 502.5 L 808.5 502.5 Z M 1065.5 228.5 L 1106.5 228.5 L 1106.5 502.5 L 1065.5 502.5 Z M 1065.5 228.5 "/>
 </clipPath>
-<image id="image309" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image310" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 626 194 L 672 194 M 626 148 L 672 148 M 626 148 L 626 194 M 672 148 L 672 194 " 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 626 194 L 672 194 M 626 148 L 672 148 M 672 194 L 672 148 M 626 194 L 626 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 626 427 L 672 427 M 626 380 L 672 380 M 626 380 L 626 427 M 672 380 L 672 427 M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.svg b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.svg
index 50cbdbc..fcd2166 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_2.svg
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image377" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1385.5 666.5 L 1426.5 666.5 L 1426.5 844.5 L 1385.5 844.5 Z M 439.5 666.5 L 480.5 666.5 L 480.5 844.5 L 439.5 844.5 Z M 553.5 666.5 L 594.5 666.5 L 594.5 844.5 L 553.5 844.5 Z M 668.5 666.5 L 709.5 666.5 L 709.5 844.5 L 668.5 844.5 Z M 783.5 666.5 L 824.5 666.5 L 824.5 844.5 L 783.5 844.5 Z M 1040.5 666.5 L 1081.5 666.5 L 1081.5 844.5 L 1040.5 844.5 Z M 1155.5 666.5 L 1196.5 666.5 L 1196.5 844.5 L 1155.5 844.5 Z M 1270.5 666.5 L 1311.5 666.5 L 1311.5 844.5 L 1270.5 844.5 Z M 1270.5 666.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1385.5 228.5 L 1426.5 228.5 L 1426.5 502.5 L 1385.5 502.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 502.5 L 439.5 502.5 Z M 553.5 228.5 L 594.5 228.5 L 594.5 502.5 L 553.5 502.5 Z M 668.5 228.5 L 709.5 228.5 L 709.5 502.5 L 668.5 502.5 Z M 783.5 228.5 L 824.5 228.5 L 824.5 502.5 L 783.5 502.5 Z M 1040.5 228.5 L 1081.5 228.5 L 1081.5 502.5 L 1040.5 502.5 Z M 1155.5 228.5 L 1196.5 228.5 L 1196.5 502.5 L 1155.5 502.5 Z M 1270.5 228.5 L 1311.5 228.5 L 1311.5 502.5 L 1270.5 502.5 Z M 1270.5 228.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface346">
+<g id="surface374">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,5 @@
 <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 372 194 L 418 194 M 372 148 L 418 148 M 372 148 L 372 194 M 418 148 L 418 194 " 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 372 194 L 418 194 M 372 148 L 418 148 M 418 194 L 418 148 M 372 194 L 372 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.svg b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.svg
index 46e878e..2ba849c 100644
--- a/cells/a22oi/sky130_fd_sc_hd__a22oi_4.svg
+++ b/cells/a22oi/sky130_fd_sc_hd__a22oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1591.5 626.5 L 1620.5 626.5 L 1620.5 750.5 L 1591.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 608.5 626.5 L 636.5 626.5 L 636.5 750.5 L 608.5 750.5 Z M 688.5 626.5 L 717.5 626.5 L 717.5 750.5 L 688.5 750.5 Z M 768.5 626.5 L 797.5 626.5 L 797.5 750.5 L 768.5 750.5 Z M 849.5 626.5 L 878.5 626.5 L 878.5 750.5 L 849.5 750.5 Z M 1029.5 626.5 L 1057.5 626.5 L 1057.5 750.5 L 1029.5 750.5 Z M 1109.5 626.5 L 1138.5 626.5 L 1138.5 750.5 L 1109.5 750.5 Z M 1189.5 626.5 L 1218.5 626.5 L 1218.5 750.5 L 1189.5 750.5 Z M 1270.5 626.5 L 1298.5 626.5 L 1298.5 750.5 L 1270.5 750.5 Z M 1350.5 626.5 L 1379.5 626.5 L 1379.5 750.5 L 1350.5 750.5 Z M 1430.5 626.5 L 1459.5 626.5 L 1459.5 750.5 L 1430.5 750.5 Z M 1511.5 626.5 L 1540.5 626.5 L 1540.5 750.5 L 1511.5 750.5 Z M 1511.5 626.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1591.5 320.5 L 1620.5 320.5 L 1620.5 511.5 L 1591.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 688.5 320.5 L 717.5 320.5 L 717.5 511.5 L 688.5 511.5 Z M 768.5 320.5 L 797.5 320.5 L 797.5 511.5 L 768.5 511.5 Z M 849.5 320.5 L 878.5 320.5 L 878.5 511.5 L 849.5 511.5 Z M 1029.5 320.5 L 1057.5 320.5 L 1057.5 511.5 L 1029.5 511.5 Z M 1109.5 320.5 L 1138.5 320.5 L 1138.5 511.5 L 1109.5 511.5 Z M 1189.5 320.5 L 1218.5 320.5 L 1218.5 511.5 L 1189.5 511.5 Z M 1270.5 320.5 L 1298.5 320.5 L 1298.5 511.5 L 1270.5 511.5 Z M 1350.5 320.5 L 1379.5 320.5 L 1379.5 511.5 L 1350.5 511.5 Z M 1430.5 320.5 L 1459.5 320.5 L 1459.5 511.5 L 1430.5 511.5 Z M 1511.5 320.5 L 1540.5 320.5 L 1540.5 511.5 L 1511.5 511.5 Z M 1511.5 320.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 415 593 L 448 593 M 415 560 L 448 560 M 415 560 L 415 593 M 448 560 L 448 593 M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.svg b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.svg
index cbf508e..aa4b31c 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image387" 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="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 1292.5 729.5 L 1333.5 729.5 L 1333.5 844.5 L 1292.5 844.5 Z M 1177.5 729.5 L 1218.5 729.5 L 1218.5 844.5 L 1177.5 844.5 Z M 1062.5 729.5 L 1103.5 729.5 L 1103.5 844.5 L 1062.5 844.5 Z M 841.5 729.5 L 882.5 729.5 L 882.5 844.5 L 841.5 844.5 Z M 726.5 729.5 L 767.5 729.5 L 767.5 844.5 L 726.5 844.5 Z M 726.5 729.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1085.5 228.5 L 1127.5 228.5 L 1127.5 343.5 L 1085.5 343.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 343.5 L 1315.5 343.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 343.5 L 1200.5 343.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 824.5 387.5 L 865.5 387.5 L 865.5 502.5 L 824.5 502.5 Z M 726.5 387.5 L 767.5 387.5 L 767.5 502.5 L 726.5 502.5 Z M 726.5 387.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,5 @@
 <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 499 706 L 545 706 M 499 659 L 545 659 M 499 659 L 499 706 M 545 659 L 545 706 " 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 499 706 L 545 706 M 499 659 L 545 659 M 545 706 L 545 659 M 499 706 L 499 659 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.svg b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.svg
index c315fc5..5f1cc10 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image387" 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="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 429.5 885.5 L 475.5 885.5 L 475.5 931.5 L 429.5 931.5 Z M 429.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 507.5 666.5 L 548.5 666.5 L 548.5 844.5 L 507.5 844.5 Z M 1352.5 729.5 L 1393.5 729.5 L 1393.5 844.5 L 1352.5 844.5 Z M 1237.5 729.5 L 1278.5 729.5 L 1278.5 844.5 L 1237.5 844.5 Z M 1122.5 729.5 L 1163.5 729.5 L 1163.5 844.5 L 1122.5 844.5 Z M 897.5 729.5 L 938.5 729.5 L 938.5 844.5 L 897.5 844.5 Z M 782.5 729.5 L 823.5 729.5 L 823.5 844.5 L 782.5 844.5 Z M 622.5 666.5 L 663.5 666.5 L 663.5 844.5 L 622.5 844.5 Z M 622.5 666.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1263.5 228.5 L 1304.5 228.5 L 1304.5 403.5 L 1263.5 403.5 Z M 1378.5 228.5 L 1419.5 228.5 L 1419.5 403.5 L 1378.5 403.5 Z M 1139.5 228.5 L 1180.5 228.5 L 1180.5 403.5 L 1139.5 403.5 Z M 880.5 327.5 L 921.5 327.5 L 921.5 502.5 L 880.5 502.5 Z M 622.5 228.5 L 663.5 228.5 L 663.5 502.5 L 622.5 502.5 Z M 507.5 228.5 L 548.5 228.5 L 548.5 502.5 L 507.5 502.5 Z M 782.5 327.5 L 823.5 327.5 L 823.5 502.5 L 782.5 502.5 Z M 782.5 327.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,5 @@
 <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 555 706 L 601 706 M 555 659 L 601 659 M 555 659 L 555 706 M 601 659 L 601 706 " 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 555 706 L 601 706 M 555 659 L 601 659 M 601 706 L 601 659 M 555 706 L 555 659 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.svg b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.svg
index 3e89a5a..f81af2e 100644
--- a/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hd__a2bb2o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1505.5 631.5 L 1535.5 631.5 L 1535.5 763.5 L 1505.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 909.5 631.5 L 939.5 631.5 L 939.5 763.5 L 909.5 763.5 Z M 994.5 631.5 L 1024.5 631.5 L 1024.5 763.5 L 994.5 763.5 Z M 1079.5 631.5 L 1109.5 631.5 L 1109.5 763.5 L 1079.5 763.5 Z M 1164.5 631.5 L 1195.5 631.5 L 1195.5 763.5 L 1164.5 763.5 Z M 1249.5 631.5 L 1280.5 631.5 L 1280.5 763.5 L 1249.5 763.5 Z M 1335.5 631.5 L 1365.5 631.5 L 1365.5 763.5 L 1335.5 763.5 Z M 1420.5 631.5 L 1450.5 631.5 L 1450.5 763.5 L 1420.5 763.5 Z M 1420.5 631.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1505.5 307.5 L 1535.5 307.5 L 1535.5 510.5 L 1505.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 909.5 307.5 L 939.5 307.5 L 939.5 510.5 L 909.5 510.5 Z M 994.5 307.5 L 1024.5 307.5 L 1024.5 510.5 L 994.5 510.5 Z M 1079.5 307.5 L 1109.5 307.5 L 1109.5 510.5 L 1079.5 510.5 Z M 1164.5 307.5 L 1195.5 307.5 L 1195.5 510.5 L 1164.5 510.5 Z M 1249.5 307.5 L 1280.5 307.5 L 1280.5 510.5 L 1249.5 510.5 Z M 1335.5 307.5 L 1365.5 307.5 L 1365.5 510.5 L 1335.5 510.5 Z M 1420.5 307.5 L 1450.5 307.5 L 1450.5 510.5 L 1420.5 510.5 Z M 1420.5 307.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 709.5 483.5 L 743.5 483.5 L 743.5 518.5 L 709.5 518.5 Z M 1273.5 483.5 L 1307.5 483.5 L 1307.5 518.5 L 1273.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 900 527 L 934 527 M 900 492 L 934 492 M 900 492 L 900 527 M 934 492 L 934 527 M 1553 527 L 1587 527 M 1553 492 L 1587 492 M 1553 492 L 1553 527 M 1587 492 L 1587 527 M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.svg b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.svg
index 1dc99d8..019936e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" 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="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 745.5 666.5 L 786.5 666.5 L 786.5 844.5 L 745.5 844.5 Z M 1024.5 666.5 L 1065.5 666.5 L 1065.5 844.5 L 1024.5 844.5 Z M 1139.5 666.5 L 1180.5 666.5 L 1180.5 844.5 L 1139.5 844.5 Z M 1139.5 666.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 729.5 228.5 L 770.5 228.5 L 770.5 502.5 L 729.5 502.5 Z M 1024.5 228.5 L 1065.5 228.5 L 1065.5 502.5 L 1024.5 502.5 Z M 1139.5 228.5 L 1180.5 228.5 L 1180.5 502.5 L 1139.5 502.5 Z M 1139.5 228.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface391">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.svg b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.svg
index 9932a70..814e029 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1510.5 662.5 L 1550.5 662.5 L 1550.5 835.5 L 1510.5 835.5 Z M 367.5 662.5 L 407.5 662.5 L 407.5 835.5 L 367.5 835.5 Z M 478.5 662.5 L 518.5 662.5 L 518.5 835.5 L 478.5 835.5 Z M 590.5 662.5 L 630.5 662.5 L 630.5 835.5 L 590.5 835.5 Z M 702.5 662.5 L 742.5 662.5 L 742.5 835.5 L 702.5 835.5 Z M 814.5 662.5 L 853.5 662.5 L 853.5 835.5 L 814.5 835.5 Z M 925.5 662.5 L 965.5 662.5 L 965.5 835.5 L 925.5 835.5 Z M 1175.5 662.5 L 1215.5 662.5 L 1215.5 835.5 L 1175.5 835.5 Z M 1287.5 662.5 L 1327.5 662.5 L 1327.5 835.5 L 1287.5 835.5 Z M 1399.5 662.5 L 1439.5 662.5 L 1439.5 835.5 L 1399.5 835.5 Z M 1399.5 662.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1510.5 237.5 L 1550.5 237.5 L 1550.5 503.5 L 1510.5 503.5 Z M 367.5 237.5 L 407.5 237.5 L 407.5 503.5 L 367.5 503.5 Z M 478.5 237.5 L 518.5 237.5 L 518.5 503.5 L 478.5 503.5 Z M 590.5 237.5 L 630.5 237.5 L 630.5 503.5 L 590.5 503.5 Z M 702.5 237.5 L 742.5 237.5 L 742.5 503.5 L 702.5 503.5 Z M 814.5 237.5 L 853.5 237.5 L 853.5 503.5 L 814.5 503.5 Z M 925.5 237.5 L 965.5 237.5 L 965.5 503.5 L 925.5 503.5 Z M 1175.5 237.5 L 1215.5 237.5 L 1215.5 503.5 L 1175.5 503.5 Z M 1287.5 237.5 L 1327.5 237.5 L 1327.5 503.5 L 1287.5 503.5 Z M 1399.5 237.5 L 1439.5 237.5 L 1439.5 503.5 L 1399.5 503.5 Z M 1399.5 237.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 876 520 L 921 520 M 876 475 L 921 475 M 876 475 L 876 520 M 921 475 L 921 520 M 387 611 L 432 611 M 387 566 L 432 566 M 387 566 L 387 611 M 432 566 L 432 611 M 264 611 L 310 611 M 264 566 L 310 566 M 264 566 L 264 611 M 310 566 L 310 611 M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.svg b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.svg
index e9918c3..a789278 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hd__a2bb2oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <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="#image336"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1594.5 609.5 L 1618.5 609.5 L 1618.5 710.5 L 1594.5 710.5 Z M 265.5 609.5 L 289.5 609.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 609.5 L 354.5 609.5 L 354.5 710.5 L 331.5 710.5 Z M 397.5 609.5 L 420.5 609.5 L 420.5 710.5 L 397.5 710.5 Z M 462.5 609.5 L 486.5 609.5 L 486.5 710.5 L 462.5 710.5 Z M 528.5 609.5 L 551.5 609.5 L 551.5 710.5 L 528.5 710.5 Z M 594.5 609.5 L 617.5 609.5 L 617.5 710.5 L 594.5 710.5 Z M 659.5 609.5 L 683.5 609.5 L 683.5 710.5 L 659.5 710.5 Z M 725.5 609.5 L 748.5 609.5 L 748.5 710.5 L 725.5 710.5 Z M 791.5 609.5 L 814.5 609.5 L 814.5 710.5 L 791.5 710.5 Z M 856.5 609.5 L 880.5 609.5 L 880.5 710.5 L 856.5 710.5 Z M 922.5 609.5 L 945.5 609.5 L 945.5 710.5 L 922.5 710.5 Z M 988.5 609.5 L 1011.5 609.5 L 1011.5 710.5 L 988.5 710.5 Z M 1135.5 609.5 L 1158.5 609.5 L 1158.5 710.5 L 1135.5 710.5 Z M 1200.5 609.5 L 1224.5 609.5 L 1224.5 710.5 L 1200.5 710.5 Z M 1266.5 609.5 L 1289.5 609.5 L 1289.5 710.5 L 1266.5 710.5 Z M 1332.5 609.5 L 1355.5 609.5 L 1355.5 710.5 L 1332.5 710.5 Z M 1397.5 609.5 L 1421.5 609.5 L 1421.5 710.5 L 1397.5 710.5 Z M 1463.5 609.5 L 1486.5 609.5 L 1486.5 710.5 L 1463.5 710.5 Z M 1529.5 609.5 L 1552.5 609.5 L 1552.5 710.5 L 1529.5 710.5 Z M 1529.5 609.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image337"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1594.5 358.5 L 1618.5 358.5 L 1618.5 515.5 L 1594.5 515.5 Z M 265.5 358.5 L 289.5 358.5 L 289.5 515.5 L 265.5 515.5 Z M 331.5 358.5 L 354.5 358.5 L 354.5 515.5 L 331.5 515.5 Z M 397.5 358.5 L 420.5 358.5 L 420.5 515.5 L 397.5 515.5 Z M 462.5 358.5 L 486.5 358.5 L 486.5 515.5 L 462.5 515.5 Z M 528.5 358.5 L 551.5 358.5 L 551.5 515.5 L 528.5 515.5 Z M 594.5 358.5 L 617.5 358.5 L 617.5 515.5 L 594.5 515.5 Z M 659.5 358.5 L 683.5 358.5 L 683.5 515.5 L 659.5 515.5 Z M 725.5 358.5 L 748.5 358.5 L 748.5 515.5 L 725.5 515.5 Z M 791.5 358.5 L 814.5 358.5 L 814.5 515.5 L 791.5 515.5 Z M 856.5 358.5 L 880.5 358.5 L 880.5 515.5 L 856.5 515.5 Z M 922.5 358.5 L 945.5 358.5 L 945.5 515.5 L 922.5 515.5 Z M 988.5 358.5 L 1011.5 358.5 L 1011.5 515.5 L 988.5 515.5 Z M 1135.5 358.5 L 1158.5 358.5 L 1158.5 515.5 L 1135.5 515.5 Z M 1200.5 358.5 L 1224.5 358.5 L 1224.5 515.5 L 1200.5 515.5 Z M 1266.5 358.5 L 1289.5 358.5 L 1289.5 515.5 L 1266.5 515.5 Z M 1332.5 358.5 L 1355.5 358.5 L 1355.5 515.5 L 1332.5 515.5 Z M 1397.5 358.5 L 1421.5 358.5 L 1421.5 515.5 L 1397.5 515.5 Z M 1463.5 358.5 L 1486.5 358.5 L 1486.5 515.5 L 1463.5 515.5 Z M 1529.5 358.5 L 1552.5 358.5 L 1552.5 515.5 L 1529.5 515.5 Z M 1529.5 358.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 227 771 L 253 771 M 227 744 L 253 744 M 227 744 L 227 771 M 253 744 L 253 771 " 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 227 771 L 253 771 M 227 744 L 253 744 M 253 771 L 253 744 M 227 771 L 227 744 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 946 638 L 973 638 M 946 611 L 973 611 M 946 611 L 946 638 M 973 611 L 973 638 M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_1.svg b/cells/a311o/sky130_fd_sc_hd__a311o_1.svg
index c037871..f8398e3 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_1.svg
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 701.5 666.5 L 742.5 666.5 L 742.5 844.5 L 701.5 844.5 Z M 848.5 666.5 L 889.5 666.5 L 889.5 844.5 L 848.5 844.5 Z M 1031.5 666.5 L 1072.5 666.5 L 1072.5 844.5 L 1031.5 844.5 Z M 1161.5 666.5 L 1202.5 666.5 L 1202.5 844.5 L 1161.5 844.5 Z M 1161.5 666.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 573.5 228.5 L 614.5 228.5 L 614.5 502.5 L 573.5 502.5 Z M 692.5 228.5 L 733.5 228.5 L 733.5 502.5 L 692.5 502.5 Z M 823.5 228.5 L 864.5 228.5 L 864.5 502.5 L 823.5 502.5 Z M 1031.5 228.5 L 1072.5 228.5 L 1072.5 502.5 L 1031.5 502.5 Z M 1161.5 228.5 L 1202.5 228.5 L 1202.5 502.5 L 1161.5 502.5 Z M 1161.5 228.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface308">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_2.svg b/cells/a311o/sky130_fd_sc_hd__a311o_2.svg
index 2b26a11..2a30cc7 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_2.svg
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 790.5 666.5 L 831.5 666.5 L 831.5 844.5 L 790.5 844.5 Z M 924.5 666.5 L 965.5 666.5 L 965.5 844.5 L 924.5 844.5 Z M 1066.5 666.5 L 1107.5 666.5 L 1107.5 844.5 L 1066.5 844.5 Z M 1220.5 666.5 L 1261.5 666.5 L 1261.5 844.5 L 1220.5 844.5 Z M 1220.5 666.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 790.5 228.5 L 831.5 228.5 L 831.5 502.5 L 790.5 502.5 Z M 924.5 228.5 L 965.5 228.5 L 965.5 502.5 L 924.5 502.5 Z M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 1222.5 228.5 L 1263.5 228.5 L 1263.5 502.5 L 1222.5 502.5 Z M 1222.5 228.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <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 562 706 L 608 706 M 562 659 L 608 659 M 562 659 L 562 706 M 608 659 L 608 706 " 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 562 706 L 608 706 M 562 659 L 608 659 M 608 706 L 608 659 M 562 706 L 562 659 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hd__a311o_4.svg b/cells/a311o/sky130_fd_sc_hd__a311o_4.svg
index d182d55..4d691ae 100644
--- a/cells/a311o/sky130_fd_sc_hd__a311o_4.svg
+++ b/cells/a311o/sky130_fd_sc_hd__a311o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <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="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1594.5 631.5 L 1625.5 631.5 L 1625.5 763.5 L 1594.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 722.5 631.5 L 753.5 631.5 L 753.5 763.5 L 722.5 763.5 Z M 807.5 631.5 L 838.5 631.5 L 838.5 763.5 L 807.5 763.5 Z M 892.5 631.5 L 923.5 631.5 L 923.5 763.5 L 892.5 763.5 Z M 1055.5 631.5 L 1085.5 631.5 L 1085.5 763.5 L 1055.5 763.5 Z M 1140.5 631.5 L 1170.5 631.5 L 1170.5 763.5 L 1140.5 763.5 Z M 1339.5 631.5 L 1369.5 631.5 L 1369.5 763.5 L 1339.5 763.5 Z M 1424.5 631.5 L 1454.5 631.5 L 1454.5 763.5 L 1424.5 763.5 Z M 1509.5 631.5 L 1539.5 631.5 L 1539.5 763.5 L 1509.5 763.5 Z M 1509.5 631.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 738.5 307.5 L 769.5 307.5 L 769.5 510.5 L 738.5 510.5 Z M 824.5 307.5 L 854.5 307.5 L 854.5 510.5 L 824.5 510.5 Z M 909.5 307.5 L 939.5 307.5 L 939.5 510.5 L 909.5 510.5 Z M 994.5 307.5 L 1024.5 307.5 L 1024.5 510.5 L 994.5 510.5 Z M 1079.5 307.5 L 1109.5 307.5 L 1109.5 510.5 L 1079.5 510.5 Z M 1164.5 307.5 L 1195.5 307.5 L 1195.5 510.5 L 1164.5 510.5 Z M 1262.5 307.5 L 1292.5 307.5 L 1292.5 510.5 L 1262.5 510.5 Z M 1347.5 307.5 L 1377.5 307.5 L 1377.5 510.5 L 1347.5 510.5 Z M 1509.5 307.5 L 1539.5 307.5 L 1539.5 510.5 L 1509.5 510.5 Z M 1509.5 307.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface348">
+<g id="surface376">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,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 897.25 581.652344 L 894.304688 581.652344 L 894.09375 580.777344 L 893.8125 579.972656 L 893.425781 579.269531 L 892.9375 578.707031 L 892.339844 578.289062 L 891.675781 577.9375 L 891.113281 577.796875 L 890.832031 577.761719 L 890.550781 577.691406 L 890.238281 577.691406 L 889.957031 577.65625 L 889.042969 577.761719 L 888.238281 577.972656 L 887.5 578.324219 L 886.835938 578.847656 L 886.273438 579.515625 L 885.820312 580.285156 L 885.503906 580.953125 L 885.292969 581.652344 L 885.082031 582.390625 L 884.976562 583.230469 L 884.871094 584.074219 L 884.871094 584.984375 L 884.90625 586.316406 L 885.082031 587.476562 L 885.398438 588.527344 L 885.785156 589.4375 L 886.308594 590.246094 L 886.976562 590.910156 L 887.394531 591.261719 L 887.851562 591.507812 L 888.34375 591.71875 L 888.867188 591.859375 L 889.429688 591.960938 L 890.027344 591.960938 L 891.183594 591.859375 L 892.164062 591.472656 L 893.007812 590.875 L 893.671875 590 L 894.164062 588.914062 L 894.515625 587.542969 L 897.460938 587.542969 L 897.285156 588.878906 L 896.96875 590.035156 L 896.511719 591.085938 L 895.917969 591.996094 L 895.179688 592.804688 L 894.339844 593.46875 L 893.707031 593.855469 L 893.042969 594.136719 L 892.339844 594.347656 L 891.570312 594.523438 L 890.761719 594.628906 L 889.957031 594.664062 L 888.730469 594.558594 L 887.605469 594.347656 L 886.554688 593.960938 L 885.609375 593.46875 L 884.730469 592.804688 L 883.960938 591.960938 L 883.292969 591.085938 L 882.734375 590.070312 L 882.347656 588.949219 L 882.03125 587.71875 L 881.855469 586.421875 L 881.820312 584.984375 L 881.855469 583.476562 L 882.066406 582.074219 L 882.417969 580.777344 L 882.875 579.585938 L 883.46875 578.5 L 884.207031 577.515625 L 884.976562 576.746094 L 885.820312 576.113281 L 886.730469 575.625 L 887.746094 575.273438 L 888.832031 575.0625 L 889.992188 574.957031 L 891.289062 575.0625 L 892.480469 575.273438 L 893.566406 575.695312 L 894.515625 576.21875 L 895.320312 576.957031 L 896.023438 577.796875 L 896.335938 578.359375 L 896.617188 578.917969 L 896.828125 579.550781 L 897.039062 580.214844 L 897.144531 580.917969 Z M 897.25 581.652344 "/>
 <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 903.210938 568.296875 L 903.210938 583.265625 L 910.992188 575.484375 L 914.746094 575.484375 L 908.363281 581.828125 L 915.867188 593.855469 L 912.257812 593.855469 L 906.050781 583.898438 L 903.210938 586.703125 L 903.210938 593.855469 L 900.300781 593.855469 L 900.300781 568.296875 Z M 903.210938 568.296875 "/>
 <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 243 596 L 277 596 M 243 561 L 277 561 M 243 561 L 243 596 M 277 561 L 277 596 M 243 458 L 277 458 M 243 423 L 277 423 M 243 423 L 243 458 M 277 423 L 277 458 M 429 596 L 464 596 M 429 561 L 464 561 M 429 561 L 429 596 M 464 561 L 464 596 M 1641 596 L 1675 596 M 1641 561 L 1675 561 M 1641 561 L 1641 596 M 1675 561 L 1675 596 M 212 264 L 212 271 M 208 268 L 215 268 M 776 493 L 776 502 M 771 498 L 780 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.svg b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.svg
index 8b95e14..c6f68b3 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_1.svg
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 564.5 885.5 L 611.5 885.5 L 611.5 931.5 L 564.5 931.5 Z M 564.5 885.5 "/>
 </clipPath>
 <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="#image342"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1137.5 666.5 L 1178.5 666.5 L 1178.5 844.5 L 1137.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 746.5 666.5 L 787.5 666.5 L 787.5 844.5 L 746.5 844.5 Z M 864.5 666.5 L 905.5 666.5 L 905.5 844.5 L 864.5 844.5 Z M 1002.5 666.5 L 1043.5 666.5 L 1043.5 844.5 L 1002.5 844.5 Z M 1002.5 666.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1131.5 228.5 L 1172.5 228.5 L 1172.5 502.5 L 1131.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 746.5 228.5 L 787.5 228.5 L 787.5 502.5 L 746.5 502.5 Z M 864.5 228.5 L 905.5 228.5 L 905.5 502.5 L 864.5 502.5 Z M 995.5 228.5 L 1036.5 228.5 L 1036.5 502.5 L 995.5 502.5 Z M 995.5 228.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <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 564 194 L 611 194 M 564 148 L 611 148 M 564 148 L 564 194 M 611 148 L 611 194 " 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 564 194 L 611 194 M 564 148 L 611 148 M 611 194 L 611 148 M 564 194 L 564 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.svg b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.svg
index f60384c..51bf1ad 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_2.svg
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image377" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1549.5 662.5 L 1589.5 662.5 L 1589.5 835.5 L 1549.5 835.5 Z M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 443.5 662.5 L 482.5 662.5 L 482.5 835.5 L 443.5 835.5 Z M 554.5 662.5 L 594.5 662.5 L 594.5 835.5 L 554.5 835.5 Z M 666.5 662.5 L 706.5 662.5 L 706.5 835.5 L 666.5 835.5 Z M 916.5 662.5 L 956.5 662.5 L 956.5 835.5 L 916.5 835.5 Z M 1028.5 662.5 L 1068.5 662.5 L 1068.5 835.5 L 1028.5 835.5 Z M 1147.5 662.5 L 1187.5 662.5 L 1187.5 835.5 L 1147.5 835.5 Z M 1259.5 662.5 L 1299.5 662.5 L 1299.5 835.5 L 1259.5 835.5 Z M 1437.5 662.5 L 1477.5 662.5 L 1477.5 835.5 L 1437.5 835.5 Z M 1437.5 662.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1549.5 237.5 L 1589.5 237.5 L 1589.5 503.5 L 1549.5 503.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 443.5 237.5 L 482.5 237.5 L 482.5 503.5 L 443.5 503.5 Z M 554.5 237.5 L 594.5 237.5 L 594.5 503.5 L 554.5 503.5 Z M 669.5 237.5 L 709.5 237.5 L 709.5 503.5 L 669.5 503.5 Z M 786.5 237.5 L 826.5 237.5 L 826.5 503.5 L 786.5 503.5 Z M 897.5 237.5 L 937.5 237.5 L 937.5 503.5 L 897.5 503.5 Z M 1147.5 237.5 L 1187.5 237.5 L 1187.5 503.5 L 1147.5 503.5 Z M 1259.5 237.5 L 1299.5 237.5 L 1299.5 503.5 L 1259.5 503.5 Z M 1437.5 237.5 L 1477.5 237.5 L 1477.5 503.5 L 1437.5 503.5 Z M 1437.5 237.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface346">
+<g id="surface374">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -194,6 +194,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.svg b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.svg
index 893cd7e..e9a9849 100644
--- a/cells/a311oi/sky130_fd_sc_hd__a311oi_4.svg
+++ b/cells/a311oi/sky130_fd_sc_hd__a311oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image437" 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="#image409"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1629.5 609.5 L 1652.5 609.5 L 1652.5 710.5 L 1629.5 710.5 Z M 265.5 609.5 L 289.5 609.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 609.5 L 354.5 609.5 L 354.5 710.5 L 331.5 710.5 Z M 397.5 609.5 L 420.5 609.5 L 420.5 710.5 L 397.5 710.5 Z M 462.5 609.5 L 486.5 609.5 L 486.5 710.5 L 462.5 710.5 Z M 528.5 609.5 L 551.5 609.5 L 551.5 710.5 L 528.5 710.5 Z M 594.5 609.5 L 617.5 609.5 L 617.5 710.5 L 594.5 710.5 Z M 659.5 609.5 L 683.5 609.5 L 683.5 710.5 L 659.5 710.5 Z M 725.5 609.5 L 748.5 609.5 L 748.5 710.5 L 725.5 710.5 Z M 872.5 609.5 L 895.5 609.5 L 895.5 710.5 L 872.5 710.5 Z M 938.5 609.5 L 961.5 609.5 L 961.5 710.5 L 938.5 710.5 Z M 1003.5 609.5 L 1027.5 609.5 L 1027.5 710.5 L 1003.5 710.5 Z M 1069.5 609.5 L 1092.5 609.5 L 1092.5 710.5 L 1069.5 710.5 Z M 1135.5 609.5 L 1158.5 609.5 L 1158.5 710.5 L 1135.5 710.5 Z M 1200.5 609.5 L 1224.5 609.5 L 1224.5 710.5 L 1200.5 710.5 Z M 1266.5 609.5 L 1289.5 609.5 L 1289.5 710.5 L 1266.5 710.5 Z M 1332.5 609.5 L 1355.5 609.5 L 1355.5 710.5 L 1332.5 710.5 Z M 1432.5 609.5 L 1455.5 609.5 L 1455.5 710.5 L 1432.5 710.5 Z M 1497.5 609.5 L 1521.5 609.5 L 1521.5 710.5 L 1497.5 710.5 Z M 1563.5 609.5 L 1586.5 609.5 L 1586.5 710.5 L 1563.5 710.5 Z M 1563.5 609.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1629.5 358.5 L 1652.5 358.5 L 1652.5 515.5 L 1629.5 515.5 Z M 265.5 358.5 L 289.5 358.5 L 289.5 515.5 L 265.5 515.5 Z M 331.5 358.5 L 354.5 358.5 L 354.5 515.5 L 331.5 515.5 Z M 397.5 358.5 L 420.5 358.5 L 420.5 515.5 L 397.5 515.5 Z M 462.5 358.5 L 486.5 358.5 L 486.5 515.5 L 462.5 515.5 Z M 528.5 358.5 L 551.5 358.5 L 551.5 515.5 L 528.5 515.5 Z M 594.5 358.5 L 617.5 358.5 L 617.5 515.5 L 594.5 515.5 Z M 659.5 358.5 L 683.5 358.5 L 683.5 515.5 L 659.5 515.5 Z M 725.5 358.5 L 748.5 358.5 L 748.5 515.5 L 725.5 515.5 Z M 791.5 358.5 L 814.5 358.5 L 814.5 515.5 L 791.5 515.5 Z M 856.5 358.5 L 880.5 358.5 L 880.5 515.5 L 856.5 515.5 Z M 922.5 358.5 L 945.5 358.5 L 945.5 515.5 L 922.5 515.5 Z M 988.5 358.5 L 1011.5 358.5 L 1011.5 515.5 L 988.5 515.5 Z M 1135.5 358.5 L 1158.5 358.5 L 1158.5 515.5 L 1135.5 515.5 Z M 1200.5 358.5 L 1224.5 358.5 L 1224.5 515.5 L 1200.5 515.5 Z M 1266.5 358.5 L 1289.5 358.5 L 1289.5 515.5 L 1266.5 515.5 Z M 1332.5 358.5 L 1355.5 358.5 L 1355.5 515.5 L 1332.5 515.5 Z M 1432.5 358.5 L 1455.5 358.5 L 1455.5 515.5 L 1432.5 515.5 Z M 1497.5 358.5 L 1521.5 358.5 L 1521.5 515.5 L 1497.5 515.5 Z M 1563.5 358.5 L 1586.5 358.5 L 1586.5 515.5 L 1563.5 515.5 Z M 1563.5 358.5 "/>
 </clipPath>
-<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image411"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image412"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface406">
+<g id="surface434">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -234,6 +234,5 @@
 <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 227 345 L 253 345 M 227 319 L 253 319 M 227 319 L 227 345 M 253 319 L 253 345 " 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 227 345 L 253 345 M 227 319 L 253 319 M 253 345 L 253 319 M 227 345 L 227 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_1.svg b/cells/a31o/sky130_fd_sc_hd__a31o_1.svg
index bbbd92d..db1c36f 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_1.svg
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image347" 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="#image347"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <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="#image347"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1158.5 666.5 L 1199.5 666.5 L 1199.5 844.5 L 1158.5 844.5 Z M 631.5 666.5 L 672.5 666.5 L 672.5 844.5 L 631.5 844.5 Z M 767.5 666.5 L 808.5 666.5 L 808.5 844.5 L 767.5 844.5 Z M 895.5 666.5 L 936.5 666.5 L 936.5 844.5 L 895.5 844.5 Z M 1027.5 666.5 L 1068.5 666.5 L 1068.5 844.5 L 1027.5 844.5 Z M 1027.5 666.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image348"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1158.5 228.5 L 1199.5 228.5 L 1199.5 502.5 L 1158.5 502.5 Z M 631.5 228.5 L 672.5 228.5 L 672.5 502.5 L 631.5 502.5 Z M 767.5 228.5 L 808.5 228.5 L 808.5 502.5 L 767.5 502.5 Z M 895.5 228.5 L 936.5 228.5 L 936.5 502.5 L 895.5 502.5 Z M 1027.5 228.5 L 1068.5 228.5 L 1068.5 502.5 L 1027.5 502.5 Z M 1027.5 228.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image350"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_2.svg b/cells/a31o/sky130_fd_sc_hd__a31o_2.svg
index 55c1d38..133c4be 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_2.svg
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 745.5 666.5 L 786.5 666.5 L 786.5 844.5 L 745.5 844.5 Z M 860.5 666.5 L 901.5 666.5 L 901.5 844.5 L 860.5 844.5 Z M 975.5 666.5 L 1016.5 666.5 L 1016.5 844.5 L 975.5 844.5 Z M 1106.5 666.5 L 1147.5 666.5 L 1147.5 844.5 L 1106.5 844.5 Z M 1106.5 666.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1237.5 228.5 L 1278.5 228.5 L 1278.5 502.5 L 1237.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 860.5 228.5 L 901.5 228.5 L 901.5 502.5 L 860.5 502.5 Z M 975.5 228.5 L 1016.5 228.5 L 1016.5 502.5 L 975.5 502.5 Z M 1106.5 228.5 L 1147.5 228.5 L 1147.5 502.5 L 1106.5 502.5 Z M 1106.5 228.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hd__a31o_4.svg b/cells/a31o/sky130_fd_sc_hd__a31o_4.svg
index 7bce0cc..408982a 100644
--- a/cells/a31o/sky130_fd_sc_hd__a31o_4.svg
+++ b/cells/a31o/sky130_fd_sc_hd__a31o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image346" 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="#image346"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1519.5 645.5 L 1553.5 645.5 L 1553.5 794.5 L 1519.5 794.5 Z M 309.5 645.5 L 343.5 645.5 L 343.5 794.5 L 309.5 794.5 Z M 405.5 645.5 L 440.5 645.5 L 440.5 794.5 L 405.5 794.5 Z M 502.5 645.5 L 536.5 645.5 L 536.5 794.5 L 502.5 794.5 Z M 598.5 645.5 L 633.5 645.5 L 633.5 794.5 L 598.5 794.5 Z M 695.5 645.5 L 730.5 645.5 L 730.5 794.5 L 695.5 794.5 Z M 805.5 645.5 L 840.5 645.5 L 840.5 794.5 L 805.5 794.5 Z M 916.5 645.5 L 950.5 645.5 L 950.5 794.5 L 916.5 794.5 Z M 1013.5 645.5 L 1047.5 645.5 L 1047.5 794.5 L 1013.5 794.5 Z M 1229.5 645.5 L 1263.5 645.5 L 1263.5 794.5 L 1229.5 794.5 Z M 1325.5 645.5 L 1360.5 645.5 L 1360.5 794.5 L 1325.5 794.5 Z M 1422.5 645.5 L 1456.5 645.5 L 1456.5 794.5 L 1422.5 794.5 Z M 1422.5 645.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1519.5 277.5 L 1553.5 277.5 L 1553.5 507.5 L 1519.5 507.5 Z M 309.5 277.5 L 343.5 277.5 L 343.5 507.5 L 309.5 507.5 Z M 405.5 277.5 L 440.5 277.5 L 440.5 507.5 L 405.5 507.5 Z M 502.5 277.5 L 536.5 277.5 L 536.5 507.5 L 502.5 507.5 Z M 598.5 277.5 L 633.5 277.5 L 633.5 507.5 L 598.5 507.5 Z M 695.5 277.5 L 730.5 277.5 L 730.5 507.5 L 695.5 507.5 Z M 805.5 277.5 L 840.5 277.5 L 840.5 507.5 L 805.5 507.5 Z M 916.5 277.5 L 950.5 277.5 L 950.5 507.5 L 916.5 507.5 Z M 1013.5 277.5 L 1047.5 277.5 L 1047.5 507.5 L 1013.5 507.5 Z M 1229.5 277.5 L 1263.5 277.5 L 1263.5 507.5 L 1229.5 507.5 Z M 1325.5 277.5 L 1360.5 277.5 L 1360.5 507.5 L 1325.5 507.5 Z M 1422.5 277.5 L 1456.5 277.5 L 1456.5 507.5 L 1422.5 507.5 Z M 1422.5 277.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image349"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface315">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,5 @@
 <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 252 876 L 291 876 M 252 837 L 291 837 M 252 837 L 252 876 M 291 837 L 291 876 " 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 252 876 L 291 876 M 252 837 L 291 837 M 291 876 L 291 837 M 252 876 L 252 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.svg b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.svg
index 4058385..8e9ae9b 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_1.svg
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <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="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1125.5 666.5 L 1166.5 666.5 L 1166.5 844.5 L 1125.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 854.5 666.5 L 895.5 666.5 L 895.5 844.5 L 854.5 844.5 Z M 995.5 666.5 L 1036.5 666.5 L 1036.5 844.5 L 995.5 844.5 Z M 995.5 666.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image334"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1125.5 228.5 L 1166.5 228.5 L 1166.5 502.5 L 1125.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 871.5 228.5 L 912.5 228.5 L 912.5 502.5 L 871.5 502.5 Z M 995.5 228.5 L 1036.5 228.5 L 1036.5 502.5 L 995.5 502.5 Z M 995.5 228.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 689 194 L 735 194 M 689 148 L 735 148 M 689 148 L 689 194 M 735 148 L 735 194 " 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 689 194 L 735 194 M 689 148 L 735 148 M 735 194 L 735 148 M 689 194 L 689 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.svg b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.svg
index 43a38f2..b91b6c4 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_2.svg
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image392" 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="#image364"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <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="#image392"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1440.5 666.5 L 1481.5 666.5 L 1481.5 844.5 L 1440.5 844.5 Z M 439.5 666.5 L 480.5 666.5 L 480.5 844.5 L 439.5 844.5 Z M 553.5 666.5 L 594.5 666.5 L 594.5 844.5 L 553.5 844.5 Z M 668.5 666.5 L 709.5 666.5 L 709.5 844.5 L 668.5 844.5 Z M 783.5 666.5 L 824.5 666.5 L 824.5 844.5 L 783.5 844.5 Z M 1040.5 666.5 L 1081.5 666.5 L 1081.5 844.5 L 1040.5 844.5 Z M 1163.5 666.5 L 1204.5 666.5 L 1204.5 844.5 L 1163.5 844.5 Z M 1303.5 666.5 L 1344.5 666.5 L 1344.5 844.5 L 1303.5 844.5 Z M 1303.5 666.5 "/>
 </clipPath>
-<image id="image365" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1440.5 228.5 L 1481.5 228.5 L 1481.5 502.5 L 1440.5 502.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 502.5 L 439.5 502.5 Z M 553.5 228.5 L 594.5 228.5 L 594.5 502.5 L 553.5 502.5 Z M 668.5 228.5 L 709.5 228.5 L 709.5 502.5 L 668.5 502.5 Z M 783.5 228.5 L 824.5 228.5 L 824.5 502.5 L 783.5 502.5 Z M 898.5 228.5 L 939.5 228.5 L 939.5 502.5 L 898.5 502.5 Z M 1163.5 228.5 L 1204.5 228.5 L 1204.5 502.5 L 1163.5 502.5 Z M 1303.5 228.5 L 1344.5 228.5 L 1344.5 502.5 L 1303.5 502.5 Z M 1303.5 228.5 "/>
 </clipPath>
-<image id="image366" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image367" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface361">
+<g id="surface389">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <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 372 194 L 418 194 M 372 148 L 418 148 M 372 148 L 372 194 M 418 148 L 418 194 " 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 372 194 L 418 194 M 372 148 L 418 148 M 418 194 L 418 148 M 372 194 L 372 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.svg b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.svg
index 0bbade9..9f1dcd7 100644
--- a/cells/a31oi/sky130_fd_sc_hd__a31oi_4.svg
+++ b/cells/a31oi/sky130_fd_sc_hd__a31oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image413" 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="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1591.5 626.5 L 1620.5 626.5 L 1620.5 750.5 L 1591.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 608.5 626.5 L 636.5 626.5 L 636.5 750.5 L 608.5 750.5 Z M 688.5 626.5 L 717.5 626.5 L 717.5 750.5 L 688.5 750.5 Z M 768.5 626.5 L 797.5 626.5 L 797.5 750.5 L 768.5 750.5 Z M 849.5 626.5 L 878.5 626.5 L 878.5 750.5 L 849.5 750.5 Z M 1029.5 626.5 L 1057.5 626.5 L 1057.5 750.5 L 1029.5 750.5 Z M 1109.5 626.5 L 1138.5 626.5 L 1138.5 750.5 L 1109.5 750.5 Z M 1189.5 626.5 L 1218.5 626.5 L 1218.5 750.5 L 1189.5 750.5 Z M 1270.5 626.5 L 1298.5 626.5 L 1298.5 750.5 L 1270.5 750.5 Z M 1350.5 626.5 L 1379.5 626.5 L 1379.5 750.5 L 1350.5 750.5 Z M 1430.5 626.5 L 1459.5 626.5 L 1459.5 750.5 L 1430.5 750.5 Z M 1511.5 626.5 L 1540.5 626.5 L 1540.5 750.5 L 1511.5 750.5 Z M 1511.5 626.5 "/>
 </clipPath>
-<image id="image386" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1591.5 320.5 L 1620.5 320.5 L 1620.5 511.5 L 1591.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 688.5 320.5 L 717.5 320.5 L 717.5 511.5 L 688.5 511.5 Z M 768.5 320.5 L 797.5 320.5 L 797.5 511.5 L 768.5 511.5 Z M 849.5 320.5 L 878.5 320.5 L 878.5 511.5 L 849.5 511.5 Z M 933.5 320.5 L 962.5 320.5 L 962.5 511.5 L 933.5 511.5 Z M 1013.5 320.5 L 1042.5 320.5 L 1042.5 511.5 L 1013.5 511.5 Z M 1094.5 320.5 L 1122.5 320.5 L 1122.5 511.5 L 1094.5 511.5 Z M 1174.5 320.5 L 1203.5 320.5 L 1203.5 511.5 L 1174.5 511.5 Z M 1350.5 320.5 L 1379.5 320.5 L 1379.5 511.5 L 1350.5 511.5 Z M 1430.5 320.5 L 1459.5 320.5 L 1459.5 511.5 L 1430.5 511.5 Z M 1511.5 320.5 L 1540.5 320.5 L 1540.5 511.5 L 1511.5 511.5 Z M 1511.5 320.5 "/>
 </clipPath>
-<image id="image387" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image388" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface382">
+<g id="surface410">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -218,6 +218,5 @@
 <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 239 300 L 272 300 M 239 268 L 272 268 M 239 268 L 239 300 M 272 268 L 272 300 " 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 239 300 L 272 300 M 239 268 L 272 268 M 272 300 L 272 268 M 239 300 L 239 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_1.svg b/cells/a32o/sky130_fd_sc_hd__a32o_1.svg
index b34212e..cafd6e8 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_1.svg
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" 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="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1314.5 666.5 L 1355.5 666.5 L 1355.5 844.5 L 1314.5 844.5 Z M 585.5 666.5 L 626.5 666.5 L 626.5 844.5 L 585.5 844.5 Z M 767.5 666.5 L 808.5 666.5 L 808.5 844.5 L 767.5 844.5 Z M 890.5 666.5 L 931.5 666.5 L 931.5 844.5 L 890.5 844.5 Z M 1054.5 666.5 L 1095.5 666.5 L 1095.5 844.5 L 1054.5 844.5 Z M 1215.5 666.5 L 1256.5 666.5 L 1256.5 844.5 L 1215.5 844.5 Z M 1215.5 666.5 "/>
 </clipPath>
-<image id="image337" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1314.5 228.5 L 1355.5 228.5 L 1355.5 502.5 L 1314.5 502.5 Z M 585.5 228.5 L 626.5 228.5 L 626.5 502.5 L 585.5 502.5 Z M 759.5 228.5 L 800.5 228.5 L 800.5 502.5 L 759.5 502.5 Z M 890.5 228.5 L 931.5 228.5 L 931.5 502.5 L 890.5 502.5 Z M 1054.5 228.5 L 1095.5 228.5 L 1095.5 502.5 L 1054.5 502.5 Z M 1196.5 228.5 L 1237.5 228.5 L 1237.5 502.5 L 1196.5 502.5 Z M 1196.5 228.5 "/>
 </clipPath>
-<image id="image338" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image339" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_2.svg b/cells/a32o/sky130_fd_sc_hd__a32o_2.svg
index 224dbd6..75f9d1b 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_2.svg
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image367" 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="#image367"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 835.5 666.5 L 876.5 666.5 L 876.5 844.5 L 835.5 844.5 Z M 973.5 666.5 L 1014.5 666.5 L 1014.5 844.5 L 973.5 844.5 Z M 1105.5 666.5 L 1146.5 666.5 L 1146.5 844.5 L 1105.5 844.5 Z M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1263.5 666.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 875.5 228.5 L 916.5 228.5 L 916.5 502.5 L 875.5 502.5 Z M 990.5 228.5 L 1031.5 228.5 L 1031.5 502.5 L 990.5 502.5 Z M 1105.5 228.5 L 1146.5 228.5 L 1146.5 502.5 L 1105.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image370"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hd__a32o_4.svg b/cells/a32o/sky130_fd_sc_hd__a32o_4.svg
index 55987a0..5da8754 100644
--- a/cells/a32o/sky130_fd_sc_hd__a32o_4.svg
+++ b/cells/a32o/sky130_fd_sc_hd__a32o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image364" 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="#image364"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <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="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 626.5 L 1631.5 626.5 L 1631.5 750.5 L 1603.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 608.5 626.5 L 636.5 626.5 L 636.5 750.5 L 608.5 750.5 Z M 688.5 626.5 L 717.5 626.5 L 717.5 750.5 L 688.5 750.5 Z M 868.5 626.5 L 897.5 626.5 L 897.5 750.5 L 868.5 750.5 Z M 948.5 626.5 L 977.5 626.5 L 977.5 750.5 L 948.5 750.5 Z M 1029.5 626.5 L 1057.5 626.5 L 1057.5 750.5 L 1029.5 750.5 Z M 1109.5 626.5 L 1138.5 626.5 L 1138.5 750.5 L 1109.5 750.5 Z M 1353.5 626.5 L 1382.5 626.5 L 1382.5 750.5 L 1353.5 750.5 Z M 1433.5 626.5 L 1462.5 626.5 L 1462.5 750.5 L 1433.5 750.5 Z M 1522.5 626.5 L 1551.5 626.5 L 1551.5 750.5 L 1522.5 750.5 Z M 1522.5 626.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1603.5 320.5 L 1631.5 320.5 L 1631.5 511.5 L 1603.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 688.5 320.5 L 717.5 320.5 L 717.5 511.5 L 688.5 511.5 Z M 868.5 320.5 L 897.5 320.5 L 897.5 511.5 L 868.5 511.5 Z M 948.5 320.5 L 977.5 320.5 L 977.5 511.5 L 948.5 511.5 Z M 1029.5 320.5 L 1057.5 320.5 L 1057.5 511.5 L 1029.5 511.5 Z M 1109.5 320.5 L 1138.5 320.5 L 1138.5 511.5 L 1109.5 511.5 Z M 1362.5 320.5 L 1390.5 320.5 L 1390.5 511.5 L 1362.5 511.5 Z M 1442.5 320.5 L 1471.5 320.5 L 1471.5 511.5 L 1442.5 511.5 Z M 1522.5 320.5 L 1551.5 320.5 L 1551.5 511.5 L 1522.5 511.5 Z M 1522.5 320.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface361">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.svg b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.svg
index 6edc566..77fa2cd 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_1.svg
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 734.5 666.5 L 775.5 666.5 L 775.5 844.5 L 734.5 844.5 Z M 904.5 666.5 L 945.5 666.5 L 945.5 844.5 L 904.5 844.5 Z M 1005.5 666.5 L 1046.5 666.5 L 1046.5 844.5 L 1005.5 844.5 Z M 1005.5 666.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1136.5 228.5 L 1177.5 228.5 L 1177.5 502.5 L 1136.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 904.5 228.5 L 945.5 228.5 L 945.5 502.5 L 904.5 502.5 Z M 1018.5 228.5 L 1060.5 228.5 L 1060.5 502.5 L 1018.5 502.5 Z M 1018.5 228.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.svg b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.svg
index 634532a..53d43f9 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_2.svg
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image416" 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="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1562.5 653.5 L 1599.5 653.5 L 1599.5 813.5 L 1562.5 813.5 Z M 319.5 653.5 L 356.5 653.5 L 356.5 813.5 L 319.5 813.5 Z M 423.5 653.5 L 460.5 653.5 L 460.5 813.5 L 423.5 813.5 Z M 526.5 653.5 L 563.5 653.5 L 563.5 813.5 L 526.5 813.5 Z M 630.5 653.5 L 667.5 653.5 L 667.5 813.5 L 630.5 813.5 Z M 875.5 653.5 L 912.5 653.5 L 912.5 813.5 L 875.5 813.5 Z M 979.5 653.5 L 1016.5 653.5 L 1016.5 813.5 L 979.5 813.5 Z M 1085.5 653.5 L 1122.5 653.5 L 1122.5 813.5 L 1085.5 813.5 Z M 1188.5 653.5 L 1225.5 653.5 L 1225.5 813.5 L 1188.5 813.5 Z M 1434.5 653.5 L 1471.5 653.5 L 1471.5 813.5 L 1434.5 813.5 Z M 1434.5 653.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1562.5 258.5 L 1599.5 258.5 L 1599.5 505.5 L 1562.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 423.5 258.5 L 460.5 258.5 L 460.5 505.5 L 423.5 505.5 Z M 526.5 258.5 L 563.5 258.5 L 563.5 505.5 L 526.5 505.5 Z M 630.5 258.5 L 667.5 258.5 L 667.5 505.5 L 630.5 505.5 Z M 733.5 258.5 L 770.5 258.5 L 770.5 505.5 L 733.5 505.5 Z M 957.5 258.5 L 994.5 258.5 L 994.5 505.5 L 957.5 505.5 Z M 1068.5 258.5 L 1105.5 258.5 L 1105.5 505.5 L 1068.5 505.5 Z M 1255.5 258.5 L 1292.5 258.5 L 1292.5 505.5 L 1255.5 505.5 Z M 1360.5 258.5 L 1397.5 258.5 L 1397.5 505.5 L 1360.5 505.5 Z M 1360.5 258.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface385">
+<g id="surface413">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -219,6 +219,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.svg b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.svg
index 19a9379..d567bb8 100644
--- a/cells/a32oi/sky130_fd_sc_hd__a32oi_4.svg
+++ b/cells/a32oi/sky130_fd_sc_hd__a32oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image472" 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="#image443"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image443"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1631.5 605.5 L 1653.5 605.5 L 1653.5 702.5 L 1631.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 513.5 605.5 L 535.5 605.5 L 535.5 702.5 L 513.5 702.5 Z M 576.5 605.5 L 598.5 605.5 L 598.5 702.5 L 576.5 702.5 Z M 639.5 605.5 L 661.5 605.5 L 661.5 702.5 L 639.5 702.5 Z M 701.5 605.5 L 724.5 605.5 L 724.5 702.5 L 701.5 702.5 Z M 842.5 605.5 L 864.5 605.5 L 864.5 702.5 L 842.5 702.5 Z M 904.5 605.5 L 927.5 605.5 L 927.5 702.5 L 904.5 702.5 Z M 967.5 605.5 L 990.5 605.5 L 990.5 702.5 L 967.5 702.5 Z M 1030.5 605.5 L 1052.5 605.5 L 1052.5 702.5 L 1030.5 702.5 Z M 1114.5 605.5 L 1136.5 605.5 L 1136.5 702.5 L 1114.5 702.5 Z M 1176.5 605.5 L 1199.5 605.5 L 1199.5 702.5 L 1176.5 702.5 Z M 1239.5 605.5 L 1262.5 605.5 L 1262.5 702.5 L 1239.5 702.5 Z M 1302.5 605.5 L 1324.5 605.5 L 1324.5 702.5 L 1302.5 702.5 Z M 1442.5 605.5 L 1465.5 605.5 L 1465.5 702.5 L 1442.5 702.5 Z M 1505.5 605.5 L 1528.5 605.5 L 1528.5 702.5 L 1505.5 702.5 Z M 1568.5 605.5 L 1590.5 605.5 L 1590.5 702.5 L 1568.5 702.5 Z M 1568.5 605.5 "/>
 </clipPath>
-<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image444"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1631.5 366.5 L 1653.5 366.5 L 1653.5 516.5 L 1631.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 513.5 366.5 L 535.5 366.5 L 535.5 516.5 L 513.5 516.5 Z M 576.5 366.5 L 598.5 366.5 L 598.5 516.5 L 576.5 516.5 Z M 639.5 366.5 L 661.5 366.5 L 661.5 516.5 L 639.5 516.5 Z M 701.5 366.5 L 724.5 366.5 L 724.5 516.5 L 701.5 516.5 Z M 767.5 366.5 L 789.5 366.5 L 789.5 516.5 L 767.5 516.5 Z M 830.5 366.5 L 852.5 366.5 L 852.5 516.5 L 830.5 516.5 Z M 893.5 366.5 L 915.5 366.5 L 915.5 516.5 L 893.5 516.5 Z M 1016.5 366.5 L 1038.5 366.5 L 1038.5 516.5 L 1016.5 516.5 Z M 1114.5 366.5 L 1136.5 366.5 L 1136.5 516.5 L 1114.5 516.5 Z M 1176.5 366.5 L 1199.5 366.5 L 1199.5 516.5 L 1176.5 516.5 Z M 1239.5 366.5 L 1262.5 366.5 L 1262.5 516.5 L 1239.5 516.5 Z M 1302.5 366.5 L 1324.5 366.5 L 1324.5 516.5 L 1302.5 516.5 Z M 1442.5 366.5 L 1465.5 366.5 L 1465.5 516.5 L 1442.5 516.5 Z M 1505.5 366.5 L 1528.5 366.5 L 1528.5 516.5 L 1505.5 516.5 Z M 1568.5 366.5 L 1590.5 366.5 L 1590.5 516.5 L 1568.5 516.5 Z M 1568.5 366.5 "/>
 </clipPath>
-<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image474" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image445"/>
+  <use xlink:href="#image474"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image475" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image446"/>
+  <use xlink:href="#image475"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface440">
+<g id="surface469">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -249,6 +249,5 @@
 <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 237 744 L 237 751 M 233 748 L 240 748 " 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 237 748 L 237 748 M 237 748 L 237 748 M 237 748 L 237 748 M 237 748 L 237 748 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_1.svg b/cells/a41o/sky130_fd_sc_hd__a41o_1.svg
index 49716ab..8440d3d 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_1.svg
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image376" 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="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 742.5 666.5 L 783.5 666.5 L 783.5 844.5 L 742.5 844.5 Z M 938.5 666.5 L 979.5 666.5 L 979.5 844.5 L 938.5 844.5 Z M 1053.5 666.5 L 1094.5 666.5 L 1094.5 844.5 L 1053.5 844.5 Z M 1184.5 666.5 L 1225.5 666.5 L 1225.5 844.5 L 1184.5 844.5 Z M 1184.5 666.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 823.5 228.5 L 864.5 228.5 L 864.5 502.5 L 823.5 502.5 Z M 938.5 228.5 L 979.5 228.5 L 979.5 502.5 L 938.5 502.5 Z M 1053.5 228.5 L 1094.5 228.5 L 1094.5 502.5 L 1053.5 502.5 Z M 1184.5 228.5 L 1225.5 228.5 L 1225.5 502.5 L 1184.5 502.5 Z M 1184.5 228.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface345">
+<g id="surface373">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -196,6 +196,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_2.svg b/cells/a41o/sky130_fd_sc_hd__a41o_2.svg
index b721728..f66c60b 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_2.svg
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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="#image369"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 875.5 666.5 L 916.5 666.5 L 916.5 844.5 L 875.5 844.5 Z M 990.5 666.5 L 1031.5 666.5 L 1031.5 844.5 L 990.5 844.5 Z M 1105.5 666.5 L 1146.5 666.5 L 1146.5 844.5 L 1105.5 844.5 Z M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1263.5 666.5 "/>
 </clipPath>
-<image id="image341" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 875.5 228.5 L 916.5 228.5 L 916.5 502.5 L 875.5 502.5 Z M 990.5 228.5 L 1031.5 228.5 L 1031.5 502.5 L 990.5 502.5 Z M 1105.5 228.5 L 1146.5 228.5 L 1146.5 502.5 L 1105.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image342" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image343" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hd__a41o_4.svg b/cells/a41o/sky130_fd_sc_hd__a41o_4.svg
index 5a1f083..a0ea191 100644
--- a/cells/a41o/sky130_fd_sc_hd__a41o_4.svg
+++ b/cells/a41o/sky130_fd_sc_hd__a41o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1534.5 626.5 L 1563.5 626.5 L 1563.5 750.5 L 1534.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 612.5 626.5 L 640.5 626.5 L 640.5 750.5 L 612.5 750.5 Z M 692.5 626.5 L 721.5 626.5 L 721.5 750.5 L 692.5 750.5 Z M 872.5 626.5 L 900.5 626.5 L 900.5 750.5 L 872.5 750.5 Z M 952.5 626.5 L 981.5 626.5 L 981.5 750.5 L 952.5 750.5 Z M 1033.5 626.5 L 1061.5 626.5 L 1061.5 750.5 L 1033.5 750.5 Z M 1113.5 626.5 L 1142.5 626.5 L 1142.5 750.5 L 1113.5 750.5 Z M 1293.5 626.5 L 1321.5 626.5 L 1321.5 750.5 L 1293.5 750.5 Z M 1373.5 626.5 L 1402.5 626.5 L 1402.5 750.5 L 1373.5 750.5 Z M 1453.5 626.5 L 1482.5 626.5 L 1482.5 750.5 L 1453.5 750.5 Z M 1453.5 626.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1534.5 320.5 L 1563.5 320.5 L 1563.5 511.5 L 1534.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 707.5 320.5 L 736.5 320.5 L 736.5 511.5 L 707.5 511.5 Z M 788.5 320.5 L 816.5 320.5 L 816.5 511.5 L 788.5 511.5 Z M 872.5 320.5 L 900.5 320.5 L 900.5 511.5 L 872.5 511.5 Z M 952.5 320.5 L 981.5 320.5 L 981.5 511.5 L 952.5 511.5 Z M 1033.5 320.5 L 1061.5 320.5 L 1061.5 511.5 L 1033.5 511.5 Z M 1113.5 320.5 L 1142.5 320.5 L 1142.5 511.5 L 1113.5 511.5 Z M 1197.5 320.5 L 1226.5 320.5 L 1226.5 511.5 L 1197.5 511.5 Z M 1373.5 320.5 L 1402.5 320.5 L 1402.5 511.5 L 1373.5 511.5 Z M 1453.5 320.5 L 1482.5 320.5 L 1482.5 511.5 L 1453.5 511.5 Z M 1453.5 320.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface330">
+<g id="surface358">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.svg b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.svg
index 1472c47..81a8bc1 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_1.svg
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image368" 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="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <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="#image368"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1224.5 666.5 L 1265.5 666.5 L 1265.5 844.5 L 1224.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 804.5 666.5 L 845.5 666.5 L 845.5 844.5 L 804.5 844.5 Z M 941.5 666.5 L 982.5 666.5 L 982.5 844.5 L 941.5 844.5 Z M 1066.5 666.5 L 1107.5 666.5 L 1107.5 844.5 L 1066.5 844.5 Z M 1066.5 666.5 "/>
 </clipPath>
-<image id="image341" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1224.5 228.5 L 1265.5 228.5 L 1265.5 502.5 L 1224.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 787.5 228.5 L 828.5 228.5 L 828.5 502.5 L 787.5 502.5 Z M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 1066.5 228.5 "/>
 </clipPath>
-<image id="image342" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image343" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface365">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 563 194 L 610 194 M 563 148 L 610 148 M 563 148 L 563 194 M 610 148 L 610 194 " 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 563 194 L 610 194 M 563 148 L 610 148 M 610 194 L 610 148 M 563 194 L 563 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.svg b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.svg
index 7b72616..ece2b74 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_2.svg
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" 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="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1530.5 653.5 L 1567.5 653.5 L 1567.5 813.5 L 1530.5 813.5 Z M 341.5 653.5 L 378.5 653.5 L 378.5 813.5 L 341.5 813.5 Z M 445.5 653.5 L 482.5 653.5 L 482.5 813.5 L 445.5 813.5 Z M 677.5 653.5 L 714.5 653.5 L 714.5 813.5 L 677.5 813.5 Z M 780.5 653.5 L 817.5 653.5 L 817.5 813.5 L 780.5 813.5 Z M 884.5 653.5 L 921.5 653.5 L 921.5 813.5 L 884.5 813.5 Z M 987.5 653.5 L 1024.5 653.5 L 1024.5 813.5 L 987.5 813.5 Z M 1219.5 653.5 L 1256.5 653.5 L 1256.5 813.5 L 1219.5 813.5 Z M 1323.5 653.5 L 1360.5 653.5 L 1360.5 813.5 L 1323.5 813.5 Z M 1426.5 653.5 L 1463.5 653.5 L 1463.5 813.5 L 1426.5 813.5 Z M 1426.5 653.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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1530.5 258.5 L 1567.5 258.5 L 1567.5 505.5 L 1530.5 505.5 Z M 470.5 258.5 L 507.5 258.5 L 507.5 505.5 L 470.5 505.5 Z M 573.5 258.5 L 610.5 258.5 L 610.5 505.5 L 573.5 505.5 Z M 677.5 258.5 L 714.5 258.5 L 714.5 505.5 L 677.5 505.5 Z M 780.5 258.5 L 817.5 258.5 L 817.5 505.5 L 780.5 505.5 Z M 884.5 258.5 L 921.5 258.5 L 921.5 505.5 L 884.5 505.5 Z M 987.5 258.5 L 1024.5 258.5 L 1024.5 505.5 L 987.5 505.5 Z M 1096.5 258.5 L 1133.5 258.5 L 1133.5 505.5 L 1096.5 505.5 Z M 1323.5 258.5 L 1360.5 258.5 L 1360.5 505.5 L 1323.5 505.5 Z M 1426.5 258.5 L 1463.5 258.5 L 1463.5 505.5 L 1426.5 505.5 Z M 1426.5 258.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <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 257 229 L 299 229 M 257 187 L 299 187 M 257 187 L 257 229 M 299 187 L 299 229 " 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 257 229 L 299 229 M 257 187 L 299 187 M 299 229 L 299 187 M 257 229 L 257 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.svg b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.svg
index 6a0a8b7..3b2e141 100644
--- a/cells/a41oi/sky130_fd_sc_hd__a41oi_4.svg
+++ b/cells/a41oi/sky130_fd_sc_hd__a41oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image470" 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="#image442"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image442"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1629.5 605.5 L 1652.5 605.5 L 1652.5 702.5 L 1629.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 610.5 605.5 L 633.5 605.5 L 633.5 702.5 L 610.5 702.5 Z M 673.5 605.5 L 695.5 605.5 L 695.5 702.5 L 673.5 702.5 Z M 736.5 605.5 L 758.5 605.5 L 758.5 702.5 L 736.5 702.5 Z M 798.5 605.5 L 821.5 605.5 L 821.5 702.5 L 798.5 702.5 Z M 861.5 605.5 L 884.5 605.5 L 884.5 702.5 L 861.5 702.5 Z M 924.5 605.5 L 946.5 605.5 L 946.5 702.5 L 924.5 702.5 Z M 987.5 605.5 L 1009.5 605.5 L 1009.5 702.5 L 987.5 702.5 Z M 1049.5 605.5 L 1072.5 605.5 L 1072.5 702.5 L 1049.5 702.5 Z M 1190.5 605.5 L 1212.5 605.5 L 1212.5 702.5 L 1190.5 702.5 Z M 1253.5 605.5 L 1275.5 605.5 L 1275.5 702.5 L 1253.5 702.5 Z M 1315.5 605.5 L 1338.5 605.5 L 1338.5 702.5 L 1315.5 702.5 Z M 1378.5 605.5 L 1401.5 605.5 L 1401.5 702.5 L 1378.5 702.5 Z M 1441.5 605.5 L 1463.5 605.5 L 1463.5 702.5 L 1441.5 702.5 Z M 1504.5 605.5 L 1526.5 605.5 L 1526.5 702.5 L 1504.5 702.5 Z M 1566.5 605.5 L 1589.5 605.5 L 1589.5 702.5 L 1566.5 702.5 Z M 1566.5 605.5 "/>
 </clipPath>
-<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image443"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1629.5 366.5 L 1652.5 366.5 L 1652.5 516.5 L 1629.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 559.5 366.5 L 582.5 366.5 L 582.5 516.5 L 559.5 516.5 Z M 673.5 366.5 L 695.5 366.5 L 695.5 516.5 L 673.5 516.5 Z M 736.5 366.5 L 758.5 366.5 L 758.5 516.5 L 736.5 516.5 Z M 798.5 366.5 L 821.5 366.5 L 821.5 516.5 L 798.5 516.5 Z M 875.5 366.5 L 898.5 366.5 L 898.5 516.5 L 875.5 516.5 Z M 938.5 366.5 L 961.5 366.5 L 961.5 516.5 L 938.5 516.5 Z M 1001.5 366.5 L 1023.5 366.5 L 1023.5 516.5 L 1001.5 516.5 Z M 1124.5 366.5 L 1147.5 366.5 L 1147.5 516.5 L 1124.5 516.5 Z M 1190.5 366.5 L 1212.5 366.5 L 1212.5 516.5 L 1190.5 516.5 Z M 1253.5 366.5 L 1275.5 366.5 L 1275.5 516.5 L 1253.5 516.5 Z M 1315.5 366.5 L 1338.5 366.5 L 1338.5 516.5 L 1315.5 516.5 Z M 1378.5 366.5 L 1401.5 366.5 L 1401.5 516.5 L 1378.5 516.5 Z M 1441.5 366.5 L 1463.5 366.5 L 1463.5 516.5 L 1441.5 516.5 Z M 1504.5 366.5 L 1526.5 366.5 L 1526.5 516.5 L 1504.5 516.5 Z M 1566.5 366.5 L 1589.5 366.5 L 1589.5 516.5 L 1566.5 516.5 Z M 1566.5 366.5 "/>
 </clipPath>
-<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image444"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image445"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface439">
+<g id="surface467">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -249,6 +249,5 @@
 <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 237 338 L 237 345 M 233 342 L 240 342 " 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 237 342 L 237 342 M 237 342 L 237 342 M 237 342 L 237 342 M 237 342 L 237 342 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hd__and2_0.svg b/cells/and2/sky130_fd_sc_hd__and2_0.svg
index b3c4ed6..c88a4d8 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_0.svg
+++ b/cells/and2/sky130_fd_sc_hd__and2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image301" 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="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1040.5 729.5 L 1081.5 729.5 L 1081.5 844.5 L 1040.5 844.5 Z M 775.5 729.5 L 816.5 729.5 L 816.5 844.5 L 775.5 844.5 Z M 873.5 729.5 L 915.5 729.5 L 915.5 844.5 L 873.5 844.5 Z M 873.5 729.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 895.5 228.5 L 936.5 228.5 L 936.5 343.5 L 895.5 343.5 Z M 775.5 228.5 L 816.5 228.5 L 816.5 343.5 L 775.5 343.5 Z M 1106.5 228.5 L 1147.5 228.5 L 1147.5 403.5 L 1106.5 403.5 Z M 1106.5 228.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface298">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 687 706 L 734 706 M 687 659 L 734 659 M 687 659 L 687 706 M 734 659 L 734 706 " 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 687 706 L 734 706 M 687 659 L 734 659 M 734 706 L 734 659 M 687 706 L 687 659 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 939 520 L 986 520 M 939 473 L 986 473 M 939 473 L 939 520 M 986 473 L 986 520 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hd__and2_1.svg b/cells/and2/sky130_fd_sc_hd__and2_1.svg
index 818775e..996e7cc 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_1.svg
+++ b/cells/and2/sky130_fd_sc_hd__and2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 920.5 691.5 L 961.5 691.5 L 961.5 806.5 L 920.5 806.5 Z M 805.5 691.5 L 846.5 691.5 L 846.5 806.5 L 805.5 806.5 Z M 1068.5 666.5 L 1109.5 666.5 L 1109.5 844.5 L 1068.5 844.5 Z M 1068.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 920.5 286.5 L 961.5 286.5 L 961.5 401.5 L 920.5 401.5 Z M 805.5 286.5 L 846.5 286.5 L 846.5 401.5 L 805.5 401.5 Z M 1068.5 228.5 L 1109.5 228.5 L 1109.5 502.5 L 1068.5 502.5 Z M 1068.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,5 @@
 <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 687 194 L 734 194 M 687 148 L 734 148 M 687 148 L 687 194 M 734 148 L 734 194 " 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 687 194 L 734 194 M 687 148 L 734 148 M 734 194 L 734 148 M 687 194 L 687 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hd__and2_2.svg b/cells/and2/sky130_fd_sc_hd__and2_2.svg
index b99fc02..beb1a7e 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_2.svg
+++ b/cells/and2/sky130_fd_sc_hd__and2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 860.5 691.5 L 901.5 691.5 L 901.5 806.5 L 860.5 806.5 Z M 745.5 691.5 L 786.5 691.5 L 786.5 806.5 L 745.5 806.5 Z M 1155.5 666.5 L 1196.5 666.5 L 1196.5 844.5 L 1155.5 844.5 Z M 1008.5 666.5 L 1049.5 666.5 L 1049.5 844.5 L 1008.5 844.5 Z M 1008.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 860.5 286.5 L 901.5 286.5 L 901.5 401.5 L 860.5 401.5 Z M 745.5 286.5 L 786.5 286.5 L 786.5 401.5 L 745.5 401.5 Z M 1155.5 228.5 L 1196.5 228.5 L 1196.5 502.5 L 1155.5 502.5 Z M 1008.5 228.5 L 1049.5 228.5 L 1049.5 502.5 L 1008.5 502.5 Z M 1008.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hd__and2_4.svg b/cells/and2/sky130_fd_sc_hd__and2_4.svg
index 874f240..55ebe13 100644
--- a/cells/and2/sky130_fd_sc_hd__and2_4.svg
+++ b/cells/and2/sky130_fd_sc_hd__and2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image303" 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="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1240.5 666.5 L 1281.5 666.5 L 1281.5 844.5 L 1240.5 844.5 Z M 631.5 666.5 L 672.5 666.5 L 672.5 844.5 L 631.5 844.5 Z M 730.5 666.5 L 771.5 666.5 L 771.5 844.5 L 730.5 844.5 Z M 887.5 666.5 L 928.5 666.5 L 928.5 844.5 L 887.5 844.5 Z M 1005.5 666.5 L 1046.5 666.5 L 1046.5 844.5 L 1005.5 844.5 Z M 1122.5 666.5 L 1163.5 666.5 L 1163.5 844.5 L 1122.5 844.5 Z M 1122.5 666.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1240.5 228.5 L 1281.5 228.5 L 1281.5 502.5 L 1240.5 502.5 Z M 631.5 228.5 L 672.5 228.5 L 672.5 502.5 L 631.5 502.5 Z M 749.5 228.5 L 790.5 228.5 L 790.5 502.5 L 749.5 502.5 Z M 887.5 228.5 L 928.5 228.5 L 928.5 502.5 L 887.5 502.5 Z M 1005.5 228.5 L 1046.5 228.5 L 1046.5 502.5 L 1005.5 502.5 Z M 1122.5 228.5 L 1163.5 228.5 L 1163.5 502.5 L 1122.5 502.5 Z M 1122.5 228.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_1.svg b/cells/and2b/sky130_fd_sc_hd__and2b_1.svg
index eed6f1b..00b5083 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_1.svg
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1191.5 666.5 L 1232.5 666.5 L 1232.5 844.5 L 1191.5 844.5 Z M 693.5 729.5 L 734.5 729.5 L 734.5 844.5 L 693.5 844.5 Z M 1057.5 729.5 L 1098.5 729.5 L 1098.5 844.5 L 1057.5 844.5 Z M 950.5 729.5 L 991.5 729.5 L 991.5 844.5 L 950.5 844.5 Z M 950.5 729.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 947.5 228.5 L 988.5 228.5 L 988.5 343.5 L 947.5 343.5 Z M 693.5 228.5 L 734.5 228.5 L 734.5 343.5 L 693.5 343.5 Z M 827.5 228.5 L 868.5 228.5 L 868.5 343.5 L 827.5 343.5 Z M 1191.5 228.5 L 1232.5 228.5 L 1232.5 502.5 L 1191.5 502.5 Z M 1191.5 228.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_2.svg b/cells/and2b/sky130_fd_sc_hd__and2b_2.svg
index 1ae883b..7f0ea36 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_2.svg
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 887.5 729.5 L 928.5 729.5 L 928.5 844.5 L 887.5 844.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 1002.5 729.5 L 1043.5 729.5 L 1043.5 844.5 L 1002.5 844.5 Z M 1251.5 666.5 L 1292.5 666.5 L 1292.5 844.5 L 1251.5 844.5 Z M 1251.5 666.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 891.5 228.5 L 932.5 228.5 L 932.5 343.5 L 891.5 343.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 343.5 L 630.5 343.5 Z M 771.5 228.5 L 812.5 228.5 L 812.5 343.5 L 771.5 343.5 Z M 1251.5 228.5 L 1292.5 228.5 L 1292.5 502.5 L 1251.5 502.5 Z M 1136.5 228.5 L 1177.5 228.5 L 1177.5 502.5 L 1136.5 502.5 Z M 1136.5 228.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 677 L 1221 686 M 1216 682 L 1225 682 " 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 682 L 1221 682 M 1221 682 L 1221 682 M 1221 682 L 1221 682 M 1221 682 L 1221 682 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hd__and2b_4.svg b/cells/and2b/sky130_fd_sc_hd__and2b_4.svg
index ff82237..1776eb8 100644
--- a/cells/and2b/sky130_fd_sc_hd__and2b_4.svg
+++ b/cells/and2b/sky130_fd_sc_hd__and2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1314.5 666.5 L 1355.5 666.5 L 1355.5 781.5 L 1314.5 781.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 667.5 666.5 L 708.5 666.5 L 708.5 844.5 L 667.5 844.5 Z M 823.5 666.5 L 864.5 666.5 L 864.5 844.5 L 823.5 844.5 Z M 941.5 666.5 L 982.5 666.5 L 982.5 844.5 L 941.5 844.5 Z M 1058.5 666.5 L 1099.5 666.5 L 1099.5 844.5 L 1058.5 844.5 Z M 1176.5 666.5 L 1217.5 666.5 L 1217.5 844.5 L 1176.5 844.5 Z M 1176.5 666.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 1314.5 387.5 L 1355.5 387.5 L 1355.5 502.5 L 1314.5 502.5 Z M 1176.5 228.5 L 1217.5 228.5 L 1217.5 502.5 L 1176.5 502.5 Z M 1061.5 228.5 L 1102.5 228.5 L 1102.5 502.5 L 1061.5 502.5 Z M 946.5 228.5 L 987.5 228.5 L 987.5 502.5 L 946.5 502.5 Z M 823.5 228.5 L 864.5 228.5 L 864.5 502.5 L 823.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 681.5 228.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hd__and3_1.svg b/cells/and3/sky130_fd_sc_hd__and3_1.svg
index b153670..5be5916 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_1.svg
+++ b/cells/and3/sky130_fd_sc_hd__and3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image278"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 756.5 729.5 L 797.5 729.5 L 797.5 844.5 L 756.5 844.5 Z M 953.5 729.5 L 994.5 729.5 L 994.5 844.5 L 953.5 844.5 Z M 854.5 729.5 L 895.5 729.5 L 895.5 844.5 L 854.5 844.5 Z M 854.5 729.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 871.5 383.5 L 912.5 383.5 L 912.5 498.5 L 871.5 498.5 Z M 756.5 383.5 L 797.5 383.5 L 797.5 498.5 L 756.5 498.5 Z M 998.5 383.5 L 1039.5 383.5 L 1039.5 498.5 L 998.5 498.5 Z M 1128.5 228.5 L 1169.5 228.5 L 1169.5 502.5 L 1128.5 502.5 Z M 1128.5 228.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface275">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 687 194 L 734 194 M 687 148 L 734 148 M 687 148 L 687 194 M 734 148 L 734 194 " 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 687 194 L 734 194 M 687 148 L 734 148 M 734 194 L 734 148 M 687 194 L 687 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hd__and3_2.svg b/cells/and3/sky130_fd_sc_hd__and3_2.svg
index 05ca536..4be9067 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_2.svg
+++ b/cells/and3/sky130_fd_sc_hd__and3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 906.5 721.5 L 947.5 721.5 L 947.5 836.5 L 906.5 836.5 Z M 796.5 721.5 L 837.5 721.5 L 837.5 836.5 L 796.5 836.5 Z M 697.5 721.5 L 738.5 721.5 L 738.5 836.5 L 697.5 836.5 Z M 1072.5 666.5 L 1113.5 666.5 L 1113.5 844.5 L 1072.5 844.5 Z M 1187.5 666.5 L 1228.5 666.5 L 1228.5 844.5 L 1187.5 844.5 Z M 1187.5 666.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 811.5 368.5 L 852.5 368.5 L 852.5 483.5 L 811.5 483.5 Z M 696.5 368.5 L 737.5 368.5 L 737.5 483.5 L 696.5 483.5 Z M 1191.5 228.5 L 1232.5 228.5 L 1232.5 502.5 L 1191.5 502.5 Z M 1076.5 228.5 L 1117.5 228.5 L 1117.5 502.5 L 1076.5 502.5 Z M 941.5 387.5 L 982.5 387.5 L 982.5 502.5 L 941.5 502.5 Z M 941.5 387.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hd__and3_4.svg b/cells/and3/sky130_fd_sc_hd__and3_4.svg
index 27aa77f..7125edd 100644
--- a/cells/and3/sky130_fd_sc_hd__and3_4.svg
+++ b/cells/and3/sky130_fd_sc_hd__and3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1365.5 666.5 L 1406.5 666.5 L 1406.5 844.5 L 1365.5 844.5 Z M 607.5 666.5 L 648.5 666.5 L 648.5 844.5 L 607.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 854.5 666.5 L 895.5 666.5 L 895.5 844.5 L 854.5 844.5 Z M 1012.5 666.5 L 1053.5 666.5 L 1053.5 844.5 L 1012.5 844.5 Z M 1129.5 666.5 L 1170.5 666.5 L 1170.5 844.5 L 1129.5 844.5 Z M 1247.5 666.5 L 1288.5 666.5 L 1288.5 844.5 L 1247.5 844.5 Z M 1247.5 666.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1365.5 228.5 L 1406.5 228.5 L 1406.5 502.5 L 1365.5 502.5 Z M 607.5 228.5 L 648.5 228.5 L 648.5 502.5 L 607.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 873.5 228.5 L 915.5 228.5 L 915.5 502.5 L 873.5 502.5 Z M 1012.5 228.5 L 1053.5 228.5 L 1053.5 502.5 L 1012.5 502.5 Z M 1129.5 228.5 L 1170.5 228.5 L 1170.5 502.5 L 1129.5 502.5 Z M 1247.5 228.5 L 1288.5 228.5 L 1288.5 502.5 L 1247.5 502.5 Z M 1247.5 228.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 686 427 L 733 427 M 686 380 L 733 380 M 686 380 L 686 427 M 733 380 L 733 427 M 434 520 L 481 520 M 434 473 L 481 473 M 434 473 L 434 520 M 481 473 L 481 520 M 434 613 L 481 613 M 434 566 L 481 566 M 434 566 L 434 613 M 481 566 L 481 613 M 434 706 L 481 706 M 434 659 L 481 659 M 434 659 L 434 706 M 481 659 L 481 706 M 434 799 L 481 799 M 434 752 L 481 752 M 434 752 L 434 799 M 481 752 L 481 799 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_1.svg b/cells/and3b/sky130_fd_sc_hd__and3b_1.svg
index 95e104e..299e866 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_1.svg
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" 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="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <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="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 630.5 666.5 L 671.5 666.5 L 671.5 781.5 L 630.5 781.5 Z M 886.5 721.5 L 927.5 721.5 L 927.5 836.5 L 886.5 836.5 Z M 1095.5 721.5 L 1136.5 721.5 L 1136.5 836.5 L 1095.5 836.5 Z M 984.5 721.5 L 1025.5 721.5 L 1025.5 836.5 L 984.5 836.5 Z M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 1254.5 666.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 630.5 228.5 L 671.5 228.5 L 671.5 343.5 L 630.5 343.5 Z M 994.5 368.5 L 1035.5 368.5 L 1035.5 483.5 L 994.5 483.5 Z M 879.5 368.5 L 920.5 368.5 L 920.5 483.5 L 879.5 483.5 Z M 1124.5 387.5 L 1165.5 387.5 L 1165.5 502.5 L 1124.5 502.5 Z M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 1254.5 228.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,5 @@
 <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 563 194 L 610 194 M 563 148 L 610 148 M 563 148 L 563 194 M 610 148 L 610 194 " 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 563 194 L 610 194 M 563 148 L 610 148 M 610 194 L 610 148 M 563 194 L 563 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_2.svg b/cells/and3b/sky130_fd_sc_hd__and3b_2.svg
index fb9dcf9..644f4dc 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_2.svg
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 927.5 721.5 L 968.5 721.5 L 968.5 836.5 L 927.5 836.5 Z M 1038.5 721.5 L 1079.5 721.5 L 1079.5 836.5 L 1038.5 836.5 Z M 566.5 721.5 L 607.5 721.5 L 607.5 836.5 L 566.5 836.5 Z M 828.5 721.5 L 869.5 721.5 L 869.5 836.5 L 828.5 836.5 Z M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1200.5 666.5 L 1241.5 666.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1200.5 666.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 938.5 368.5 L 979.5 368.5 L 979.5 483.5 L 938.5 483.5 Z M 823.5 368.5 L 864.5 368.5 L 864.5 483.5 L 823.5 483.5 Z M 566.5 368.5 L 607.5 368.5 L 607.5 483.5 L 566.5 483.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 502.5 L 1200.5 502.5 Z M 1068.5 387.5 L 1109.5 387.5 L 1109.5 502.5 L 1068.5 502.5 Z M 1068.5 387.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1008 334 L 1054 334 M 1008 287 L 1054 287 M 1008 287 L 1008 334 M 1054 287 L 1054 334 M 497 427 L 544 427 M 497 380 L 544 380 M 497 380 L 497 427 M 544 380 L 544 427 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hd__and3b_4.svg b/cells/and3b/sky130_fd_sc_hd__and3b_4.svg
index 929f501..40b019b 100644
--- a/cells/and3b/sky130_fd_sc_hd__and3b_4.svg
+++ b/cells/and3b/sky130_fd_sc_hd__and3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 370.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1395.5 666.5 L 1436.5 666.5 L 1436.5 781.5 L 1395.5 781.5 Z M 497.5 666.5 L 538.5 666.5 L 538.5 844.5 L 497.5 844.5 Z M 641.5 666.5 L 682.5 666.5 L 682.5 844.5 L 641.5 844.5 Z M 745.5 666.5 L 786.5 666.5 L 786.5 844.5 L 745.5 844.5 Z M 902.5 666.5 L 943.5 666.5 L 943.5 844.5 L 902.5 844.5 Z M 1020.5 666.5 L 1061.5 666.5 L 1061.5 844.5 L 1020.5 844.5 Z M 1137.5 666.5 L 1178.5 666.5 L 1178.5 844.5 L 1137.5 844.5 Z M 1255.5 666.5 L 1296.5 666.5 L 1296.5 844.5 L 1255.5 844.5 Z M 1255.5 666.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1395.5 321.5 L 1436.5 321.5 L 1436.5 436.5 L 1395.5 436.5 Z M 902.5 228.5 L 943.5 228.5 L 943.5 502.5 L 902.5 502.5 Z M 1255.5 228.5 L 1296.5 228.5 L 1296.5 502.5 L 1255.5 502.5 Z M 1137.5 228.5 L 1178.5 228.5 L 1178.5 502.5 L 1137.5 502.5 Z M 1023.5 228.5 L 1064.5 228.5 L 1064.5 502.5 L 1023.5 502.5 Z M 641.5 228.5 L 682.5 228.5 L 682.5 502.5 L 641.5 502.5 Z M 764.5 228.5 L 805.5 228.5 L 805.5 502.5 L 764.5 502.5 Z M 497.5 228.5 L 538.5 228.5 L 538.5 502.5 L 497.5 502.5 Z M 497.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image286" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 370 938 L 417 938 M 370 892 L 417 892 M 370 892 L 370 938 M 417 892 L 417 938 " 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 370 938 L 417 938 M 370 892 L 417 892 M 417 938 L 417 892 M 370 938 L 370 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1377 613 L 1423 613 M 1377 566 L 1423 566 M 1377 566 L 1377 613 M 1423 566 L 1423 613 M 622 427 L 668 427 M 622 380 L 668 380 M 622 380 L 622 427 M 668 380 L 668 427 M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hd__and4_1.svg b/cells/and4/sky130_fd_sc_hd__and4_1.svg
index 085e5ce..617dd73 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_1.svg
+++ b/cells/and4/sky130_fd_sc_hd__and4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" 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="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 750.5 729.5 L 791.5 729.5 L 791.5 844.5 L 750.5 844.5 Z M 1027.5 729.5 L 1068.5 729.5 L 1068.5 844.5 L 1027.5 844.5 Z M 895.5 729.5 L 936.5 729.5 L 936.5 844.5 L 895.5 844.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 630.5 729.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1027.5 228.5 L 1068.5 228.5 L 1068.5 343.5 L 1027.5 343.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 343.5 L 630.5 343.5 Z M 767.5 228.5 L 808.5 228.5 L 808.5 343.5 L 767.5 343.5 Z M 909.5 228.5 L 950.5 228.5 L 950.5 343.5 L 909.5 343.5 Z M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 1254.5 228.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hd__and4_2.svg b/cells/and4/sky130_fd_sc_hd__and4_2.svg
index d9b5952..ffccf0a 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_2.svg
+++ b/cells/and4/sky130_fd_sc_hd__and4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1173.5 666.5 L 1214.5 666.5 L 1214.5 844.5 L 1173.5 844.5 Z M 687.5 729.5 L 729.5 729.5 L 729.5 844.5 L 687.5 844.5 Z M 566.5 729.5 L 607.5 729.5 L 607.5 844.5 L 566.5 844.5 Z M 964.5 729.5 L 1005.5 729.5 L 1005.5 844.5 L 964.5 844.5 Z M 832.5 729.5 L 873.5 729.5 L 873.5 844.5 L 832.5 844.5 Z M 1304.5 666.5 L 1345.5 666.5 L 1345.5 844.5 L 1304.5 844.5 Z M 1304.5 666.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 964.5 228.5 L 1005.5 228.5 L 1005.5 343.5 L 964.5 343.5 Z M 846.5 228.5 L 887.5 228.5 L 887.5 343.5 L 846.5 343.5 Z M 704.5 228.5 L 745.5 228.5 L 745.5 343.5 L 704.5 343.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 343.5 L 566.5 343.5 Z M 1173.5 228.5 L 1214.5 228.5 L 1214.5 502.5 L 1173.5 502.5 Z M 1304.5 228.5 L 1345.5 228.5 L 1345.5 502.5 L 1304.5 502.5 Z M 1304.5 228.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1002 427 L 1049 427 M 1002 380 L 1049 380 M 1002 380 L 1002 427 M 1049 380 L 1049 427 M 1002 334 L 1049 334 M 1002 287 L 1049 287 M 1002 287 L 1002 334 M 1049 287 L 1049 334 M 499 427 L 545 427 M 499 380 L 545 380 M 499 380 L 499 427 M 545 380 L 545 427 M 499 613 L 545 613 M 499 566 L 545 566 M 499 566 L 499 613 M 545 566 L 545 613 M 499 706 L 545 706 M 499 659 L 545 659 M 499 659 L 499 706 M 545 659 L 545 706 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hd__and4_4.svg b/cells/and4/sky130_fd_sc_hd__and4_4.svg
index 2fc2461..5833c37 100644
--- a/cells/and4/sky130_fd_sc_hd__and4_4.svg
+++ b/cells/and4/sky130_fd_sc_hd__and4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 611.5 666.5 L 652.5 666.5 L 652.5 844.5 L 611.5 844.5 Z M 744.5 666.5 L 785.5 666.5 L 785.5 844.5 L 744.5 844.5 Z M 904.5 666.5 L 945.5 666.5 L 945.5 844.5 L 904.5 844.5 Z M 1034.5 666.5 L 1075.5 666.5 L 1075.5 844.5 L 1034.5 844.5 Z M 1148.5 666.5 L 1189.5 666.5 L 1189.5 844.5 L 1148.5 844.5 Z M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1263.5 666.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 744.5 228.5 L 785.5 228.5 L 785.5 502.5 L 744.5 502.5 Z M 902.5 228.5 L 943.5 228.5 L 943.5 502.5 L 902.5 502.5 Z M 1034.5 228.5 L 1075.5 228.5 L 1075.5 502.5 L 1034.5 502.5 Z M 1148.5 228.5 L 1189.5 228.5 L 1189.5 502.5 L 1148.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 436 427 L 482 427 M 436 380 L 482 380 M 436 380 L 436 427 M 482 380 L 482 427 M 813 427 L 860 427 M 813 380 L 860 380 M 813 380 L 813 427 M 860 380 L 860 427 M 813 520 L 860 520 M 813 473 L 860 473 M 813 473 L 813 520 M 860 473 L 860 520 M 687 427 L 734 427 M 687 380 L 734 380 M 687 380 L 687 427 M 734 380 L 734 427 M 687 520 L 734 520 M 687 473 L 734 473 M 687 473 L 687 520 M 734 473 L 734 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_1.svg b/cells/and4b/sky130_fd_sc_hd__and4b_1.svg
index c2cd864..98ba8c7 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_1.svg
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" 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="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 823.5 729.5 L 864.5 729.5 L 864.5 844.5 L 823.5 844.5 Z M 1178.5 729.5 L 1220.5 729.5 L 1220.5 844.5 L 1178.5 844.5 Z M 1058.5 729.5 L 1099.5 729.5 L 1099.5 844.5 L 1058.5 844.5 Z M 921.5 729.5 L 962.5 729.5 L 962.5 844.5 L 921.5 844.5 Z M 566.5 729.5 L 607.5 729.5 L 607.5 844.5 L 566.5 844.5 Z M 566.5 729.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1185.5 228.5 L 1226.5 228.5 L 1226.5 343.5 L 1185.5 343.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 343.5 L 566.5 343.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 343.5 L 681.5 343.5 Z M 850.5 228.5 L 891.5 228.5 L 891.5 343.5 L 850.5 343.5 Z M 1058.5 228.5 L 1099.5 228.5 L 1099.5 343.5 L 1058.5 343.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 1315.5 228.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_2.svg b/cells/and4b/sky130_fd_sc_hd__and4b_2.svg
index 15f0cc1..87890db 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_2.svg
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" 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="#image332"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 760.5 729.5 L 801.5 729.5 L 801.5 844.5 L 760.5 844.5 Z M 503.5 729.5 L 544.5 729.5 L 544.5 844.5 L 503.5 844.5 Z M 1117.5 729.5 L 1158.5 729.5 L 1158.5 844.5 L 1117.5 844.5 Z M 995.5 729.5 L 1036.5 729.5 L 1036.5 844.5 L 995.5 844.5 Z M 858.5 729.5 L 899.5 729.5 L 899.5 844.5 L 858.5 844.5 Z M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 1378.5 666.5 "/>
 </clipPath>
-<image id="image333" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1122.5 228.5 L 1163.5 228.5 L 1163.5 343.5 L 1122.5 343.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 343.5 L 503.5 343.5 Z M 995.5 228.5 L 1036.5 228.5 L 1036.5 343.5 L 995.5 343.5 Z M 787.5 228.5 L 828.5 228.5 L 828.5 343.5 L 787.5 343.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 343.5 L 618.5 343.5 Z M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 1378.5 228.5 "/>
 </clipPath>
-<image id="image334" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image335" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 938 613 L 984 613 M 938 566 L 984 566 M 938 566 L 938 613 M 984 566 L 984 613 M 938 520 L 984 520 M 938 473 L 984 473 M 938 473 L 938 520 M 984 473 L 984 520 M 1065 427 L 1111 427 M 1065 380 L 1111 380 M 1065 380 L 1065 427 M 1111 380 L 1111 427 M 1065 520 L 1111 520 M 1065 473 L 1111 473 M 1065 473 L 1065 520 M 1111 473 L 1111 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hd__and4b_4.svg b/cells/and4b/sky130_fd_sc_hd__and4b_4.svg
index 70fee0b..dfafd1e 100644
--- a/cells/and4b/sky130_fd_sc_hd__and4b_4.svg
+++ b/cells/and4b/sky130_fd_sc_hd__and4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1185.5 666.5 L 1226.5 666.5 L 1226.5 844.5 L 1185.5 844.5 Z M 376.5 729.5 L 417.5 729.5 L 417.5 844.5 L 376.5 844.5 Z M 1341.5 666.5 L 1382.5 666.5 L 1382.5 844.5 L 1341.5 844.5 Z M 1503.5 666.5 L 1544.5 666.5 L 1544.5 844.5 L 1503.5 844.5 Z M 1070.5 666.5 L 1111.5 666.5 L 1111.5 844.5 L 1070.5 844.5 Z M 850.5 666.5 L 891.5 666.5 L 891.5 844.5 L 850.5 844.5 Z M 735.5 666.5 L 776.5 666.5 L 776.5 844.5 L 735.5 844.5 Z M 620.5 666.5 L 661.5 666.5 L 661.5 844.5 L 620.5 844.5 Z M 506.5 666.5 L 547.5 666.5 L 547.5 844.5 L 506.5 844.5 Z M 506.5 666.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 376.5 228.5 L 417.5 228.5 L 417.5 343.5 L 376.5 343.5 Z M 1070.5 228.5 L 1111.5 228.5 L 1111.5 502.5 L 1070.5 502.5 Z M 506.5 228.5 L 547.5 228.5 L 547.5 502.5 L 506.5 502.5 Z M 620.5 228.5 L 661.5 228.5 L 661.5 502.5 L 620.5 502.5 Z M 735.5 228.5 L 776.5 228.5 L 776.5 502.5 L 735.5 502.5 Z M 850.5 228.5 L 891.5 228.5 L 891.5 502.5 L 850.5 502.5 Z M 1341.5 228.5 L 1382.5 228.5 L 1382.5 502.5 L 1341.5 502.5 Z M 1185.5 228.5 L 1226.5 228.5 L 1226.5 502.5 L 1185.5 502.5 Z M 1503.5 228.5 L 1544.5 228.5 L 1544.5 502.5 L 1503.5 502.5 Z M 1503.5 228.5 "/>
 </clipPath>
-<image id="image318" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 309 938 L 355 938 M 309 892 L 355 892 M 309 892 L 309 938 M 355 892 L 355 938 " 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 309 938 L 355 938 M 309 892 L 355 892 M 355 938 L 355 892 M 309 938 L 309 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.svg b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.svg
index 6cca44c..5e06d9b 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_1.svg
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" 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="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 370.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1273.5 666.5 L 1314.5 666.5 L 1314.5 781.5 L 1273.5 781.5 Z M 994.5 666.5 L 1035.5 666.5 L 1035.5 781.5 L 994.5 781.5 Z M 1131.5 666.5 L 1172.5 666.5 L 1172.5 781.5 L 1131.5 781.5 Z M 876.5 666.5 L 917.5 666.5 L 917.5 781.5 L 876.5 781.5 Z M 1440.5 666.5 L 1481.5 666.5 L 1481.5 844.5 L 1440.5 844.5 Z M 594.5 729.5 L 636.5 729.5 L 636.5 844.5 L 594.5 844.5 Z M 477.5 729.5 L 518.5 729.5 L 518.5 844.5 L 477.5 844.5 Z M 477.5 729.5 "/>
 </clipPath>
-<image id="image323" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1273.5 228.5 L 1314.5 228.5 L 1314.5 343.5 L 1273.5 343.5 Z M 477.5 228.5 L 518.5 228.5 L 518.5 343.5 L 477.5 343.5 Z M 594.5 228.5 L 636.5 228.5 L 636.5 343.5 L 594.5 343.5 Z M 876.5 228.5 L 917.5 228.5 L 917.5 343.5 L 876.5 343.5 Z M 994.5 228.5 L 1035.5 228.5 L 1035.5 343.5 L 994.5 343.5 Z M 1131.5 228.5 L 1172.5 228.5 L 1172.5 343.5 L 1131.5 343.5 Z M 1440.5 228.5 L 1481.5 228.5 L 1481.5 502.5 L 1440.5 502.5 Z M 1440.5 228.5 "/>
 </clipPath>
-<image id="image324" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image325" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 1250 613 L 1296 613 M 1250 566 L 1296 566 M 1250 566 L 1250 613 M 1296 566 L 1296 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1250 613 L 1296 613 M 1250 566 L 1296 566 M 1296 613 L 1296 566 M 1250 613 L 1250 566 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.svg b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.svg
index b4a74e2..3fbd5cd 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_2.svg
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image344" 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="#image344"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 683.5 666.5 L 724.5 666.5 L 724.5 844.5 L 683.5 844.5 Z M 1440.5 729.5 L 1481.5 729.5 L 1481.5 844.5 L 1440.5 844.5 Z M 1278.5 729.5 L 1319.5 729.5 L 1319.5 844.5 L 1278.5 844.5 Z M 1163.5 729.5 L 1204.5 729.5 L 1204.5 844.5 L 1163.5 844.5 Z M 1039.5 729.5 L 1080.5 729.5 L 1080.5 844.5 L 1039.5 844.5 Z M 941.5 729.5 L 982.5 729.5 L 982.5 844.5 L 941.5 844.5 Z M 439.5 729.5 L 480.5 729.5 L 480.5 844.5 L 439.5 844.5 Z M 568.5 666.5 L 610.5 666.5 L 610.5 844.5 L 568.5 844.5 Z M 568.5 666.5 "/>
 </clipPath>
-<image id="image315" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1440.5 228.5 L 1481.5 228.5 L 1481.5 343.5 L 1440.5 343.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 343.5 L 439.5 343.5 Z M 1278.5 228.5 L 1319.5 228.5 L 1319.5 343.5 L 1278.5 343.5 Z M 1046.5 228.5 L 1087.5 228.5 L 1087.5 343.5 L 1046.5 343.5 Z M 917.5 228.5 L 958.5 228.5 L 958.5 343.5 L 917.5 343.5 Z M 1163.5 228.5 L 1204.5 228.5 L 1204.5 343.5 L 1163.5 343.5 Z M 568.5 228.5 L 610.5 228.5 L 610.5 502.5 L 568.5 502.5 Z M 683.5 228.5 L 724.5 228.5 L 724.5 502.5 L 683.5 502.5 Z M 683.5 228.5 "/>
 </clipPath>
-<image id="image316" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image317" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 1252 334 L 1299 334 M 1252 287 L 1299 287 M 1252 287 L 1252 334 M 1299 287 L 1299 334 " 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 1252 334 L 1299 334 M 1252 287 L 1299 287 M 1299 334 L 1299 287 M 1252 334 L 1252 287 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1252 520 L 1299 520 M 1252 473 L 1299 473 M 1252 473 L 1252 520 M 1299 473 L 1299 520 M 1252 427 L 1299 427 M 1252 380 L 1299 380 M 1252 380 L 1252 427 M 1299 380 L 1299 427 M 1377 520 L 1423 520 M 1377 473 L 1423 473 M 1377 473 L 1377 520 M 1423 473 L 1423 520 M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.svg b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.svg
index a934596..ea8ac76 100644
--- a/cells/and4bb/sky130_fd_sc_hd__and4bb_4.svg
+++ b/cells/and4bb/sky130_fd_sc_hd__and4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1129.5 653.5 L 1166.5 653.5 L 1166.5 813.5 L 1129.5 813.5 Z M 1562.5 710.5 L 1599.5 710.5 L 1599.5 813.5 L 1562.5 813.5 Z M 319.5 710.5 L 356.5 710.5 L 356.5 813.5 L 319.5 813.5 Z M 1248.5 653.5 L 1285.5 653.5 L 1285.5 813.5 L 1248.5 813.5 Z M 989.5 653.5 L 1026.5 653.5 L 1026.5 813.5 L 989.5 813.5 Z M 870.5 653.5 L 907.5 653.5 L 907.5 813.5 L 870.5 813.5 Z M 747.5 653.5 L 784.5 653.5 L 784.5 813.5 L 747.5 813.5 Z M 643.5 653.5 L 680.5 653.5 L 680.5 813.5 L 643.5 813.5 Z M 540.5 653.5 L 577.5 653.5 L 577.5 813.5 L 540.5 813.5 Z M 436.5 653.5 L 473.5 653.5 L 473.5 813.5 L 436.5 813.5 Z M 436.5 653.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1562.5 258.5 L 1599.5 258.5 L 1599.5 362.5 L 1562.5 362.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 362.5 L 319.5 362.5 Z M 436.5 258.5 L 473.5 258.5 L 473.5 505.5 L 436.5 505.5 Z M 540.5 258.5 L 577.5 258.5 L 577.5 505.5 L 540.5 505.5 Z M 643.5 258.5 L 680.5 258.5 L 680.5 505.5 L 643.5 505.5 Z M 747.5 258.5 L 784.5 258.5 L 784.5 505.5 L 747.5 505.5 Z M 1248.5 258.5 L 1285.5 258.5 L 1285.5 505.5 L 1248.5 505.5 Z M 989.5 258.5 L 1026.5 258.5 L 1026.5 505.5 L 989.5 505.5 Z M 1129.5 258.5 L 1166.5 258.5 L 1166.5 505.5 L 1129.5 505.5 Z M 870.5 258.5 L 907.5 258.5 L 907.5 505.5 L 870.5 505.5 Z M 870.5 258.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface325">
+<g id="surface354">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_1.svg b/cells/buf/sky130_fd_sc_hd__buf_1.svg
index e37adb2..bef8ba2 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_1.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 819.5 885.5 L 865.5 885.5 L 865.5 931.5 L 819.5 931.5 Z M 819.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1005.5 702.5 L 1046.5 702.5 L 1046.5 844.5 L 1005.5 844.5 Z M 884.5 702.5 L 925.5 702.5 L 925.5 844.5 L 884.5 844.5 Z M 884.5 702.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1005.5 228.5 L 1046.5 228.5 L 1046.5 444.5 L 1005.5 444.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 444.5 L 884.5 444.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 819 194 L 865 194 M 819 148 L 865 148 M 819 148 L 819 194 M 865 148 L 865 194 " 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 819 194 L 865 194 M 819 148 L 865 148 M 865 194 L 865 148 M 819 194 L 819 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_12.svg b/cells/buf/sky130_fd_sc_hd__buf_12.svg
index 445cf3d..6473962 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_12.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 328.5 794.5 L 362.5 794.5 L 362.5 828.5 L 328.5 828.5 Z M 328.5 794.5 "/>
 </clipPath>
 <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="#image338"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1570.5 631.5 L 1600.5 631.5 L 1600.5 763.5 L 1570.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 803.5 631.5 L 834.5 631.5 L 834.5 763.5 L 803.5 763.5 Z M 888.5 631.5 L 919.5 631.5 L 919.5 763.5 L 888.5 763.5 Z M 974.5 631.5 L 1004.5 631.5 L 1004.5 763.5 L 974.5 763.5 Z M 1059.5 631.5 L 1089.5 631.5 L 1089.5 763.5 L 1059.5 763.5 Z M 1144.5 631.5 L 1174.5 631.5 L 1174.5 763.5 L 1144.5 763.5 Z M 1229.5 631.5 L 1260.5 631.5 L 1260.5 763.5 L 1229.5 763.5 Z M 1314.5 631.5 L 1345.5 631.5 L 1345.5 763.5 L 1314.5 763.5 Z M 1399.5 631.5 L 1430.5 631.5 L 1430.5 763.5 L 1399.5 763.5 Z M 1485.5 631.5 L 1515.5 631.5 L 1515.5 763.5 L 1485.5 763.5 Z M 1485.5 631.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image339"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1570.5 307.5 L 1600.5 307.5 L 1600.5 510.5 L 1570.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 803.5 307.5 L 834.5 307.5 L 834.5 510.5 L 803.5 510.5 Z M 888.5 307.5 L 919.5 307.5 L 919.5 510.5 L 888.5 510.5 Z M 974.5 307.5 L 1004.5 307.5 L 1004.5 510.5 L 974.5 510.5 Z M 1059.5 307.5 L 1089.5 307.5 L 1089.5 510.5 L 1059.5 510.5 Z M 1144.5 307.5 L 1174.5 307.5 L 1174.5 510.5 L 1144.5 510.5 Z M 1229.5 307.5 L 1260.5 307.5 L 1260.5 510.5 L 1229.5 510.5 Z M 1314.5 307.5 L 1345.5 307.5 L 1345.5 510.5 L 1314.5 510.5 Z M 1399.5 307.5 L 1430.5 307.5 L 1430.5 510.5 L 1399.5 510.5 Z M 1485.5 307.5 L 1515.5 307.5 L 1515.5 510.5 L 1485.5 510.5 Z M 1485.5 307.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 328 837 L 362 837 M 328 802 L 362 802 M 328 802 L 328 837 M 362 802 L 362 837 " 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 328 837 L 362 837 M 328 802 L 362 802 M 362 837 L 362 802 M 328 837 L 328 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_16.svg b/cells/buf/sky130_fd_sc_hd__buf_16.svg
index 14455aa..56b126f 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_16.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1580.5 605.5 L 1602.5 605.5 L 1602.5 702.5 L 1580.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 513.5 605.5 L 535.5 605.5 L 535.5 702.5 L 513.5 702.5 Z M 576.5 605.5 L 598.5 605.5 L 598.5 702.5 L 576.5 702.5 Z M 639.5 605.5 L 661.5 605.5 L 661.5 702.5 L 639.5 702.5 Z M 701.5 605.5 L 724.5 605.5 L 724.5 702.5 L 701.5 702.5 Z M 764.5 605.5 L 786.5 605.5 L 786.5 702.5 L 764.5 702.5 Z M 827.5 605.5 L 849.5 605.5 L 849.5 702.5 L 827.5 702.5 Z M 890.5 605.5 L 912.5 605.5 L 912.5 702.5 L 890.5 702.5 Z M 952.5 605.5 L 975.5 605.5 L 975.5 702.5 L 952.5 702.5 Z M 1015.5 605.5 L 1037.5 605.5 L 1037.5 702.5 L 1015.5 702.5 Z M 1078.5 605.5 L 1100.5 605.5 L 1100.5 702.5 L 1078.5 702.5 Z M 1141.5 605.5 L 1163.5 605.5 L 1163.5 702.5 L 1141.5 702.5 Z M 1203.5 605.5 L 1226.5 605.5 L 1226.5 702.5 L 1203.5 702.5 Z M 1266.5 605.5 L 1288.5 605.5 L 1288.5 702.5 L 1266.5 702.5 Z M 1329.5 605.5 L 1351.5 605.5 L 1351.5 702.5 L 1329.5 702.5 Z M 1392.5 605.5 L 1414.5 605.5 L 1414.5 702.5 L 1392.5 702.5 Z M 1454.5 605.5 L 1477.5 605.5 L 1477.5 702.5 L 1454.5 702.5 Z M 1517.5 605.5 L 1539.5 605.5 L 1539.5 702.5 L 1517.5 702.5 Z M 1517.5 605.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1580.5 366.5 L 1602.5 366.5 L 1602.5 516.5 L 1580.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 513.5 366.5 L 535.5 366.5 L 535.5 516.5 L 513.5 516.5 Z M 576.5 366.5 L 598.5 366.5 L 598.5 516.5 L 576.5 516.5 Z M 639.5 366.5 L 661.5 366.5 L 661.5 516.5 L 639.5 516.5 Z M 701.5 366.5 L 724.5 366.5 L 724.5 516.5 L 701.5 516.5 Z M 764.5 366.5 L 786.5 366.5 L 786.5 516.5 L 764.5 516.5 Z M 827.5 366.5 L 849.5 366.5 L 849.5 516.5 L 827.5 516.5 Z M 890.5 366.5 L 912.5 366.5 L 912.5 516.5 L 890.5 516.5 Z M 952.5 366.5 L 975.5 366.5 L 975.5 516.5 L 952.5 516.5 Z M 1015.5 366.5 L 1037.5 366.5 L 1037.5 516.5 L 1015.5 516.5 Z M 1078.5 366.5 L 1100.5 366.5 L 1100.5 516.5 L 1078.5 516.5 Z M 1141.5 366.5 L 1163.5 366.5 L 1163.5 516.5 L 1141.5 516.5 Z M 1203.5 366.5 L 1226.5 366.5 L 1226.5 516.5 L 1203.5 516.5 Z M 1266.5 366.5 L 1288.5 366.5 L 1288.5 516.5 L 1266.5 516.5 Z M 1329.5 366.5 L 1351.5 366.5 L 1351.5 516.5 L 1329.5 516.5 Z M 1392.5 366.5 L 1414.5 366.5 L 1414.5 516.5 L 1392.5 516.5 Z M 1454.5 366.5 L 1477.5 366.5 L 1477.5 516.5 L 1454.5 516.5 Z M 1517.5 366.5 L 1539.5 366.5 L 1539.5 516.5 L 1517.5 516.5 Z M 1517.5 366.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 225 761 L 251 761 M 225 735 L 251 735 M 225 735 L 225 761 M 251 735 L 251 761 " 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 225 761 L 251 761 M 225 735 L 251 735 M 251 761 L 251 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_2.svg b/cells/buf/sky130_fd_sc_hd__buf_2.svg
index 24aef8a..210bf62 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_2.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" 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="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1065.5 666.5 L 1106.5 666.5 L 1106.5 844.5 L 1065.5 844.5 Z M 820.5 729.5 L 861.5 729.5 L 861.5 844.5 L 820.5 844.5 Z M 950.5 666.5 L 991.5 666.5 L 991.5 844.5 L 950.5 844.5 Z M 950.5 666.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 820.5 239.5 L 861.5 239.5 L 861.5 414.5 L 820.5 414.5 Z M 1065.5 228.5 L 1106.5 228.5 L 1106.5 502.5 L 1065.5 502.5 Z M 950.5 228.5 L 991.5 228.5 L 991.5 502.5 L 950.5 502.5 Z M 950.5 228.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_4.svg b/cells/buf/sky130_fd_sc_hd__buf_4.svg
index a1bdd85..44e23cb 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_4.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" 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="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1153.5 666.5 L 1194.5 666.5 L 1194.5 844.5 L 1153.5 844.5 Z M 693.5 666.5 L 734.5 666.5 L 734.5 844.5 L 693.5 844.5 Z M 808.5 666.5 L 849.5 666.5 L 849.5 844.5 L 808.5 844.5 Z M 923.5 666.5 L 964.5 666.5 L 964.5 844.5 L 923.5 844.5 Z M 1038.5 666.5 L 1079.5 666.5 L 1079.5 844.5 L 1038.5 844.5 Z M 1038.5 666.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1153.5 228.5 L 1194.5 228.5 L 1194.5 502.5 L 1153.5 502.5 Z M 693.5 228.5 L 734.5 228.5 L 734.5 502.5 L 693.5 502.5 Z M 808.5 228.5 L 849.5 228.5 L 849.5 502.5 L 808.5 502.5 Z M 923.5 228.5 L 964.5 228.5 L 964.5 502.5 L 923.5 502.5 Z M 1038.5 228.5 L 1079.5 228.5 L 1079.5 502.5 L 1038.5 502.5 Z M 1038.5 228.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 626 194 L 672 194 M 626 148 L 672 148 M 626 148 L 626 194 M 672 148 L 672 194 " 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 626 194 L 672 194 M 626 148 L 672 148 M 672 194 L 672 148 M 626 194 L 626 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_6.svg b/cells/buf/sky130_fd_sc_hd__buf_6.svg
index 0c128d0..4b23008 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_6.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image303" 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="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 574.5 666.5 L 615.5 666.5 L 615.5 844.5 L 574.5 844.5 Z M 689.5 666.5 L 730.5 666.5 L 730.5 844.5 L 689.5 844.5 Z M 804.5 666.5 L 845.5 666.5 L 845.5 844.5 L 804.5 844.5 Z M 919.5 666.5 L 960.5 666.5 L 960.5 844.5 L 919.5 844.5 Z M 1034.5 666.5 L 1075.5 666.5 L 1075.5 844.5 L 1034.5 844.5 Z M 1148.5 666.5 L 1189.5 666.5 L 1189.5 844.5 L 1148.5 844.5 Z M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1263.5 666.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 574.5 228.5 L 615.5 228.5 L 615.5 502.5 L 574.5 502.5 Z M 689.5 228.5 L 730.5 228.5 L 730.5 502.5 L 689.5 502.5 Z M 804.5 228.5 L 845.5 228.5 L 845.5 502.5 L 804.5 502.5 Z M 919.5 228.5 L 960.5 228.5 L 960.5 502.5 L 919.5 502.5 Z M 1034.5 228.5 L 1075.5 228.5 L 1075.5 502.5 L 1034.5 502.5 Z M 1148.5 228.5 L 1189.5 228.5 L 1189.5 502.5 L 1148.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hd__buf_8.svg b/cells/buf/sky130_fd_sc_hd__buf_8.svg
index 0b7f41e..623bc4c 100644
--- a/cells/buf/sky130_fd_sc_hd__buf_8.svg
+++ b/cells/buf/sky130_fd_sc_hd__buf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1448.5 662.5 L 1488.5 662.5 L 1488.5 835.5 L 1448.5 835.5 Z M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 443.5 662.5 L 482.5 662.5 L 482.5 835.5 L 443.5 835.5 Z M 554.5 662.5 L 594.5 662.5 L 594.5 835.5 L 554.5 835.5 Z M 666.5 662.5 L 706.5 662.5 L 706.5 835.5 L 666.5 835.5 Z M 778.5 662.5 L 818.5 662.5 L 818.5 835.5 L 778.5 835.5 Z M 889.5 662.5 L 929.5 662.5 L 929.5 835.5 L 889.5 835.5 Z M 1001.5 662.5 L 1041.5 662.5 L 1041.5 835.5 L 1001.5 835.5 Z M 1113.5 662.5 L 1153.5 662.5 L 1153.5 835.5 L 1113.5 835.5 Z M 1224.5 662.5 L 1264.5 662.5 L 1264.5 835.5 L 1224.5 835.5 Z M 1336.5 662.5 L 1376.5 662.5 L 1376.5 835.5 L 1336.5 835.5 Z M 1336.5 662.5 "/>
 </clipPath>
-<image id="image307" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1448.5 237.5 L 1488.5 237.5 L 1488.5 503.5 L 1448.5 503.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 443.5 237.5 L 482.5 237.5 L 482.5 503.5 L 443.5 503.5 Z M 554.5 237.5 L 594.5 237.5 L 594.5 503.5 L 554.5 503.5 Z M 666.5 237.5 L 706.5 237.5 L 706.5 503.5 L 666.5 503.5 Z M 778.5 237.5 L 818.5 237.5 L 818.5 503.5 L 778.5 503.5 Z M 889.5 237.5 L 929.5 237.5 L 929.5 503.5 L 889.5 503.5 Z M 1001.5 237.5 L 1041.5 237.5 L 1041.5 503.5 L 1001.5 503.5 Z M 1113.5 237.5 L 1153.5 237.5 L 1153.5 503.5 L 1113.5 503.5 Z M 1224.5 237.5 L 1264.5 237.5 L 1264.5 503.5 L 1224.5 503.5 Z M 1336.5 237.5 L 1376.5 237.5 L 1376.5 503.5 L 1336.5 503.5 Z M 1336.5 237.5 "/>
 </clipPath>
-<image id="image308" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image309" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.svg b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.svg
index 4c21b88..6dd5f07 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.svg
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 541.5 L 174.5 541.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image302" 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="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 217.5 696.5 L 239.5 696.5 L 239.5 718.5 L 217.5 718.5 Z M 217.5 696.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1650.5 594.5 L 1669.5 594.5 L 1669.5 677.5 L 1650.5 677.5 Z M 249.5 594.5 L 268.5 594.5 L 268.5 677.5 L 249.5 677.5 Z M 368.5 594.5 L 387.5 594.5 L 387.5 677.5 L 368.5 677.5 Z M 421.5 594.5 L 441.5 594.5 L 441.5 677.5 L 421.5 677.5 Z M 475.5 594.5 L 494.5 594.5 L 494.5 677.5 L 475.5 677.5 Z M 528.5 594.5 L 547.5 594.5 L 547.5 677.5 L 528.5 677.5 Z M 582.5 594.5 L 601.5 594.5 L 601.5 677.5 L 582.5 677.5 Z M 635.5 594.5 L 654.5 594.5 L 654.5 677.5 L 635.5 677.5 Z M 689.5 594.5 L 708.5 594.5 L 708.5 677.5 L 689.5 677.5 Z M 742.5 594.5 L 761.5 594.5 L 761.5 677.5 L 742.5 677.5 Z M 795.5 594.5 L 815.5 594.5 L 815.5 677.5 L 795.5 677.5 Z M 849.5 594.5 L 868.5 594.5 L 868.5 677.5 L 849.5 677.5 Z M 902.5 594.5 L 921.5 594.5 L 921.5 677.5 L 902.5 677.5 Z M 956.5 594.5 L 975.5 594.5 L 975.5 677.5 L 956.5 677.5 Z M 1009.5 594.5 L 1028.5 594.5 L 1028.5 677.5 L 1009.5 677.5 Z M 1063.5 594.5 L 1082.5 594.5 L 1082.5 677.5 L 1063.5 677.5 Z M 1116.5 594.5 L 1135.5 594.5 L 1135.5 677.5 L 1116.5 677.5 Z M 1169.5 594.5 L 1188.5 594.5 L 1188.5 677.5 L 1169.5 677.5 Z M 1223.5 594.5 L 1242.5 594.5 L 1242.5 677.5 L 1223.5 677.5 Z M 1276.5 594.5 L 1295.5 594.5 L 1295.5 677.5 L 1276.5 677.5 Z M 1330.5 594.5 L 1349.5 594.5 L 1349.5 677.5 L 1330.5 677.5 Z M 1383.5 594.5 L 1402.5 594.5 L 1402.5 677.5 L 1383.5 677.5 Z M 1436.5 594.5 L 1456.5 594.5 L 1456.5 677.5 L 1436.5 677.5 Z M 1490.5 594.5 L 1509.5 594.5 L 1509.5 677.5 L 1490.5 677.5 Z M 1543.5 594.5 L 1562.5 594.5 L 1562.5 677.5 L 1543.5 677.5 Z M 1597.5 594.5 L 1616.5 594.5 L 1616.5 677.5 L 1597.5 677.5 Z M 1597.5 594.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1650.5 391.5 L 1669.5 391.5 L 1669.5 518.5 L 1650.5 518.5 Z M 249.5 391.5 L 268.5 391.5 L 268.5 518.5 L 249.5 518.5 Z M 368.5 391.5 L 387.5 391.5 L 387.5 518.5 L 368.5 518.5 Z M 421.5 391.5 L 441.5 391.5 L 441.5 518.5 L 421.5 518.5 Z M 475.5 391.5 L 494.5 391.5 L 494.5 518.5 L 475.5 518.5 Z M 528.5 391.5 L 547.5 391.5 L 547.5 518.5 L 528.5 518.5 Z M 582.5 391.5 L 601.5 391.5 L 601.5 518.5 L 582.5 518.5 Z M 635.5 391.5 L 654.5 391.5 L 654.5 518.5 L 635.5 518.5 Z M 689.5 391.5 L 708.5 391.5 L 708.5 518.5 L 689.5 518.5 Z M 742.5 391.5 L 761.5 391.5 L 761.5 518.5 L 742.5 518.5 Z M 795.5 391.5 L 815.5 391.5 L 815.5 518.5 L 795.5 518.5 Z M 849.5 391.5 L 868.5 391.5 L 868.5 518.5 L 849.5 518.5 Z M 902.5 391.5 L 921.5 391.5 L 921.5 518.5 L 902.5 518.5 Z M 956.5 391.5 L 975.5 391.5 L 975.5 518.5 L 956.5 518.5 Z M 1009.5 391.5 L 1028.5 391.5 L 1028.5 518.5 L 1009.5 518.5 Z M 1063.5 391.5 L 1082.5 391.5 L 1082.5 518.5 L 1063.5 518.5 Z M 1116.5 391.5 L 1135.5 391.5 L 1135.5 518.5 L 1116.5 518.5 Z M 1169.5 391.5 L 1188.5 391.5 L 1188.5 518.5 L 1169.5 518.5 Z M 1223.5 391.5 L 1242.5 391.5 L 1242.5 518.5 L 1223.5 518.5 Z M 1276.5 391.5 L 1295.5 391.5 L 1295.5 518.5 L 1276.5 518.5 Z M 1330.5 391.5 L 1349.5 391.5 L 1349.5 518.5 L 1330.5 518.5 Z M 1383.5 391.5 L 1402.5 391.5 L 1402.5 518.5 L 1383.5 518.5 Z M 1436.5 391.5 L 1456.5 391.5 L 1456.5 518.5 L 1436.5 518.5 Z M 1490.5 391.5 L 1509.5 391.5 L 1509.5 518.5 L 1490.5 518.5 Z M 1543.5 391.5 L 1562.5 391.5 L 1562.5 518.5 L 1543.5 518.5 Z M 1597.5 391.5 L 1616.5 391.5 L 1616.5 518.5 L 1597.5 518.5 Z M 1597.5 391.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface299">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 217 729 L 239 729 M 217 707 L 239 707 M 217 707 L 217 729 M 239 707 L 239 729 " 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 217 729 L 239 729 M 217 707 L 239 707 M 239 729 L 239 707 M 217 729 L 217 707 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 198 369 L 198 374 M 195 372 L 200 372 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.svg b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.svg
index 26beba3..bbbf6f3 100644
--- a/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.svg
+++ b/cells/bufbuf/sky130_fd_sc_hd__bufbuf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image302" 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="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 248.5 810.5 L 284.5 810.5 L 284.5 847.5 L 248.5 847.5 Z M 248.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1429.5 638.5 L 1461.5 638.5 L 1461.5 778.5 L 1429.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 1519.5 638.5 L 1552.5 638.5 L 1552.5 778.5 L 1519.5 778.5 Z M 1338.5 638.5 L 1371.5 638.5 L 1371.5 778.5 L 1338.5 778.5 Z M 1248.5 638.5 L 1280.5 638.5 L 1280.5 778.5 L 1248.5 778.5 Z M 1157.5 638.5 L 1190.5 638.5 L 1190.5 778.5 L 1157.5 778.5 Z M 1067.5 638.5 L 1099.5 638.5 L 1099.5 778.5 L 1067.5 778.5 Z M 976.5 638.5 L 1009.5 638.5 L 1009.5 778.5 L 976.5 778.5 Z M 886.5 638.5 L 918.5 638.5 L 918.5 778.5 L 886.5 778.5 Z M 795.5 638.5 L 827.5 638.5 L 827.5 778.5 L 795.5 778.5 Z M 705.5 638.5 L 737.5 638.5 L 737.5 778.5 L 705.5 778.5 Z M 614.5 638.5 L 646.5 638.5 L 646.5 778.5 L 614.5 778.5 Z M 405.5 638.5 L 437.5 638.5 L 437.5 778.5 L 405.5 778.5 Z M 405.5 638.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1429.5 293.5 L 1461.5 293.5 L 1461.5 508.5 L 1429.5 508.5 Z M 300.5 370.5 L 333.5 370.5 L 333.5 508.5 L 300.5 508.5 Z M 1519.5 293.5 L 1552.5 293.5 L 1552.5 508.5 L 1519.5 508.5 Z M 1338.5 293.5 L 1371.5 293.5 L 1371.5 508.5 L 1338.5 508.5 Z M 1248.5 293.5 L 1280.5 293.5 L 1280.5 508.5 L 1248.5 508.5 Z M 1157.5 293.5 L 1190.5 293.5 L 1190.5 508.5 L 1157.5 508.5 Z M 1067.5 293.5 L 1099.5 293.5 L 1099.5 508.5 L 1067.5 508.5 Z M 976.5 293.5 L 1009.5 293.5 L 1009.5 508.5 L 976.5 508.5 Z M 886.5 293.5 L 918.5 293.5 L 918.5 508.5 L 886.5 508.5 Z M 795.5 293.5 L 827.5 293.5 L 827.5 508.5 L 795.5 508.5 Z M 705.5 293.5 L 737.5 293.5 L 737.5 508.5 L 705.5 508.5 Z M 614.5 293.5 L 646.5 293.5 L 646.5 508.5 L 614.5 508.5 Z M 405.5 293.5 L 437.5 293.5 L 437.5 508.5 L 405.5 508.5 Z M 405.5 293.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface299">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 248 855 L 284 855 M 248 819 L 284 819 M 248 819 L 248 855 M 284 819 L 284 855 " 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 248 855 L 284 855 M 248 819 L 284 819 M 284 855 L 284 819 M 248 855 L 248 819 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.svg b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.svg
index 342fe97..cf186e9 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_16.svg
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" 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="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 221.5 709.5 L 244.5 709.5 L 244.5 733.5 L 221.5 733.5 Z M 221.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1640.5 599.5 L 1660.5 599.5 L 1660.5 689.5 L 1640.5 689.5 Z M 255.5 599.5 L 275.5 599.5 L 275.5 689.5 L 255.5 689.5 Z M 312.5 599.5 L 333.5 599.5 L 333.5 689.5 L 312.5 689.5 Z M 370.5 599.5 L 391.5 599.5 L 391.5 689.5 L 370.5 689.5 Z M 428.5 599.5 L 448.5 599.5 L 448.5 689.5 L 428.5 689.5 Z M 486.5 599.5 L 506.5 599.5 L 506.5 689.5 L 486.5 689.5 Z M 543.5 599.5 L 564.5 599.5 L 564.5 689.5 L 543.5 689.5 Z M 601.5 599.5 L 622.5 599.5 L 622.5 689.5 L 601.5 689.5 Z M 659.5 599.5 L 679.5 599.5 L 679.5 689.5 L 659.5 689.5 Z M 716.5 599.5 L 737.5 599.5 L 737.5 689.5 L 716.5 689.5 Z M 774.5 599.5 L 795.5 599.5 L 795.5 689.5 L 774.5 689.5 Z M 832.5 599.5 L 852.5 599.5 L 852.5 689.5 L 832.5 689.5 Z M 890.5 599.5 L 910.5 599.5 L 910.5 689.5 L 890.5 689.5 Z M 947.5 599.5 L 968.5 599.5 L 968.5 689.5 L 947.5 689.5 Z M 1005.5 599.5 L 1026.5 599.5 L 1026.5 689.5 L 1005.5 689.5 Z M 1063.5 599.5 L 1083.5 599.5 L 1083.5 689.5 L 1063.5 689.5 Z M 1120.5 599.5 L 1141.5 599.5 L 1141.5 689.5 L 1120.5 689.5 Z M 1178.5 599.5 L 1199.5 599.5 L 1199.5 689.5 L 1178.5 689.5 Z M 1236.5 599.5 L 1256.5 599.5 L 1256.5 689.5 L 1236.5 689.5 Z M 1294.5 599.5 L 1314.5 599.5 L 1314.5 689.5 L 1294.5 689.5 Z M 1351.5 599.5 L 1372.5 599.5 L 1372.5 689.5 L 1351.5 689.5 Z M 1409.5 599.5 L 1430.5 599.5 L 1430.5 689.5 L 1409.5 689.5 Z M 1467.5 599.5 L 1487.5 599.5 L 1487.5 689.5 L 1467.5 689.5 Z M 1524.5 599.5 L 1545.5 599.5 L 1545.5 689.5 L 1524.5 689.5 Z M 1582.5 599.5 L 1603.5 599.5 L 1603.5 689.5 L 1582.5 689.5 Z M 1582.5 599.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1640.5 379.5 L 1660.5 379.5 L 1660.5 517.5 L 1640.5 517.5 Z M 255.5 379.5 L 275.5 379.5 L 275.5 517.5 L 255.5 517.5 Z M 312.5 379.5 L 333.5 379.5 L 333.5 517.5 L 312.5 517.5 Z M 370.5 379.5 L 391.5 379.5 L 391.5 517.5 L 370.5 517.5 Z M 428.5 379.5 L 448.5 379.5 L 448.5 517.5 L 428.5 517.5 Z M 486.5 379.5 L 506.5 379.5 L 506.5 517.5 L 486.5 517.5 Z M 543.5 379.5 L 564.5 379.5 L 564.5 517.5 L 543.5 517.5 Z M 601.5 379.5 L 622.5 379.5 L 622.5 517.5 L 601.5 517.5 Z M 659.5 379.5 L 679.5 379.5 L 679.5 517.5 L 659.5 517.5 Z M 716.5 379.5 L 737.5 379.5 L 737.5 517.5 L 716.5 517.5 Z M 774.5 379.5 L 795.5 379.5 L 795.5 517.5 L 774.5 517.5 Z M 832.5 379.5 L 852.5 379.5 L 852.5 517.5 L 832.5 517.5 Z M 890.5 379.5 L 910.5 379.5 L 910.5 517.5 L 890.5 517.5 Z M 947.5 379.5 L 968.5 379.5 L 968.5 517.5 L 947.5 517.5 Z M 1005.5 379.5 L 1026.5 379.5 L 1026.5 517.5 L 1005.5 517.5 Z M 1063.5 379.5 L 1083.5 379.5 L 1083.5 517.5 L 1063.5 517.5 Z M 1120.5 379.5 L 1141.5 379.5 L 1141.5 517.5 L 1120.5 517.5 Z M 1178.5 379.5 L 1199.5 379.5 L 1199.5 517.5 L 1178.5 517.5 Z M 1236.5 379.5 L 1256.5 379.5 L 1256.5 517.5 L 1236.5 517.5 Z M 1294.5 379.5 L 1314.5 379.5 L 1314.5 517.5 L 1294.5 517.5 Z M 1351.5 379.5 L 1372.5 379.5 L 1372.5 517.5 L 1351.5 517.5 Z M 1409.5 379.5 L 1430.5 379.5 L 1430.5 517.5 L 1409.5 517.5 Z M 1467.5 379.5 L 1487.5 379.5 L 1487.5 517.5 L 1467.5 517.5 Z M 1524.5 379.5 L 1545.5 379.5 L 1545.5 517.5 L 1524.5 517.5 Z M 1582.5 379.5 L 1603.5 379.5 L 1603.5 517.5 L 1582.5 517.5 Z M 1582.5 379.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 221 743 L 244 743 M 221 720 L 244 720 M 221 720 L 221 743 M 244 720 L 244 743 " 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 221 743 L 244 743 M 221 720 L 244 720 M 244 743 L 244 720 M 221 743 L 221 720 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.svg b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.svg
index ac4f706..e56ed15 100644
--- a/cells/bufinv/sky130_fd_sc_hd__bufinv_8.svg
+++ b/cells/bufinv/sky130_fd_sc_hd__bufinv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" 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="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1491.5 645.5 L 1526.5 645.5 L 1526.5 794.5 L 1491.5 794.5 Z M 309.5 645.5 L 343.5 645.5 L 343.5 794.5 L 309.5 794.5 Z M 525.5 645.5 L 559.5 645.5 L 559.5 794.5 L 525.5 794.5 Z M 621.5 645.5 L 656.5 645.5 L 656.5 794.5 L 621.5 794.5 Z M 718.5 645.5 L 753.5 645.5 L 753.5 794.5 L 718.5 794.5 Z M 815.5 645.5 L 849.5 645.5 L 849.5 794.5 L 815.5 794.5 Z M 911.5 645.5 L 946.5 645.5 L 946.5 794.5 L 911.5 794.5 Z M 1008.5 645.5 L 1042.5 645.5 L 1042.5 794.5 L 1008.5 794.5 Z M 1105.5 645.5 L 1139.5 645.5 L 1139.5 794.5 L 1105.5 794.5 Z M 1201.5 645.5 L 1236.5 645.5 L 1236.5 794.5 L 1201.5 794.5 Z M 1298.5 645.5 L 1332.5 645.5 L 1332.5 794.5 L 1298.5 794.5 Z M 1394.5 645.5 L 1429.5 645.5 L 1429.5 794.5 L 1394.5 794.5 Z M 1394.5 645.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1491.5 277.5 L 1526.5 277.5 L 1526.5 507.5 L 1491.5 507.5 Z M 309.5 277.5 L 343.5 277.5 L 343.5 507.5 L 309.5 507.5 Z M 525.5 277.5 L 559.5 277.5 L 559.5 507.5 L 525.5 507.5 Z M 621.5 277.5 L 656.5 277.5 L 656.5 507.5 L 621.5 507.5 Z M 718.5 277.5 L 753.5 277.5 L 753.5 507.5 L 718.5 507.5 Z M 815.5 277.5 L 849.5 277.5 L 849.5 507.5 L 815.5 507.5 Z M 911.5 277.5 L 946.5 277.5 L 946.5 507.5 L 911.5 507.5 Z M 1008.5 277.5 L 1042.5 277.5 L 1042.5 507.5 L 1008.5 507.5 Z M 1105.5 277.5 L 1139.5 277.5 L 1139.5 507.5 L 1105.5 507.5 Z M 1201.5 277.5 L 1236.5 277.5 L 1236.5 507.5 L 1201.5 507.5 Z M 1298.5 277.5 L 1332.5 277.5 L 1332.5 507.5 L 1298.5 507.5 Z M 1394.5 277.5 L 1429.5 277.5 L 1429.5 507.5 L 1394.5 507.5 Z M 1394.5 277.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 252 876 L 291 876 M 252 837 L 291 837 M 252 837 L 252 876 M 291 837 L 291 876 " 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 252 876 L 291 876 M 252 837 L 291 837 M 291 876 L 291 837 M 252 876 L 252 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.svg b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.svg
index ac0431c..5545870 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.svg
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 1068.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1005.5 702.5 L 1046.5 702.5 L 1046.5 844.5 L 1005.5 844.5 Z M 884.5 702.5 L 925.5 702.5 L 925.5 844.5 L 884.5 844.5 Z M 884.5 702.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1005.5 228.5 L 1046.5 228.5 L 1046.5 444.5 L 1005.5 444.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 444.5 L 884.5 444.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 1068 194 L 1114 194 M 1068 148 L 1114 148 M 1068 148 L 1068 194 M 1114 148 L 1114 194 " 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 1068 194 L 1114 194 M 1068 148 L 1114 148 M 1114 194 L 1114 148 M 1068 194 L 1068 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.svg b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.svg
index dda78a8..b7132e9 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.svg
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 229.5 743.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1609.5 650.5 L 1633.5 650.5 L 1633.5 719.5 L 1609.5 719.5 Z M 271.5 650.5 L 296.5 650.5 L 296.5 719.5 L 271.5 719.5 Z M 341.5 650.5 L 366.5 650.5 L 366.5 719.5 L 341.5 719.5 Z M 412.5 650.5 L 436.5 650.5 L 436.5 719.5 L 412.5 719.5 Z M 482.5 650.5 L 507.5 650.5 L 507.5 719.5 L 482.5 719.5 Z M 553.5 650.5 L 577.5 650.5 L 577.5 719.5 L 553.5 719.5 Z M 623.5 650.5 L 648.5 650.5 L 648.5 719.5 L 623.5 719.5 Z M 694.5 650.5 L 718.5 650.5 L 718.5 719.5 L 694.5 719.5 Z M 764.5 650.5 L 789.5 650.5 L 789.5 719.5 L 764.5 719.5 Z M 835.5 650.5 L 859.5 650.5 L 859.5 719.5 L 835.5 719.5 Z M 905.5 650.5 L 930.5 650.5 L 930.5 719.5 L 905.5 719.5 Z M 976.5 650.5 L 1000.5 650.5 L 1000.5 719.5 L 976.5 719.5 Z M 1046.5 650.5 L 1071.5 650.5 L 1071.5 719.5 L 1046.5 719.5 Z M 1116.5 650.5 L 1140.5 650.5 L 1140.5 719.5 L 1116.5 719.5 Z M 1186.5 650.5 L 1211.5 650.5 L 1211.5 719.5 L 1186.5 719.5 Z M 1257.5 650.5 L 1281.5 650.5 L 1281.5 719.5 L 1257.5 719.5 Z M 1327.5 650.5 L 1352.5 650.5 L 1352.5 719.5 L 1327.5 719.5 Z M 1397.5 650.5 L 1422.5 650.5 L 1422.5 719.5 L 1397.5 719.5 Z M 1468.5 650.5 L 1492.5 650.5 L 1492.5 719.5 L 1468.5 719.5 Z M 1538.5 650.5 L 1563.5 650.5 L 1563.5 719.5 L 1538.5 719.5 Z M 1538.5 650.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1609.5 350.5 L 1633.5 350.5 L 1633.5 514.5 L 1609.5 514.5 Z M 271.5 350.5 L 296.5 350.5 L 296.5 514.5 L 271.5 514.5 Z M 341.5 350.5 L 366.5 350.5 L 366.5 514.5 L 341.5 514.5 Z M 412.5 350.5 L 436.5 350.5 L 436.5 514.5 L 412.5 514.5 Z M 482.5 350.5 L 507.5 350.5 L 507.5 514.5 L 482.5 514.5 Z M 553.5 350.5 L 577.5 350.5 L 577.5 514.5 L 553.5 514.5 Z M 623.5 350.5 L 648.5 350.5 L 648.5 514.5 L 623.5 514.5 Z M 694.5 350.5 L 718.5 350.5 L 718.5 514.5 L 694.5 514.5 Z M 764.5 350.5 L 789.5 350.5 L 789.5 514.5 L 764.5 514.5 Z M 835.5 350.5 L 859.5 350.5 L 859.5 514.5 L 835.5 514.5 Z M 905.5 350.5 L 930.5 350.5 L 930.5 514.5 L 905.5 514.5 Z M 976.5 350.5 L 1000.5 350.5 L 1000.5 514.5 L 976.5 514.5 Z M 1046.5 350.5 L 1071.5 350.5 L 1071.5 514.5 L 1046.5 514.5 Z M 1116.5 350.5 L 1140.5 350.5 L 1140.5 514.5 L 1116.5 514.5 Z M 1186.5 350.5 L 1211.5 350.5 L 1211.5 514.5 L 1186.5 514.5 Z M 1257.5 350.5 L 1281.5 350.5 L 1281.5 514.5 L 1257.5 514.5 Z M 1327.5 350.5 L 1352.5 350.5 L 1352.5 514.5 L 1327.5 514.5 Z M 1397.5 350.5 L 1422.5 350.5 L 1422.5 514.5 L 1397.5 514.5 Z M 1468.5 350.5 L 1492.5 350.5 L 1492.5 514.5 L 1468.5 514.5 Z M 1538.5 350.5 L 1563.5 350.5 L 1563.5 514.5 L 1538.5 514.5 Z M 1538.5 350.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 229 781 L 257 781 M 229 753 L 257 753 M 229 753 L 229 781 M 257 753 L 257 781 " 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 229 781 L 257 781 M 229 753 L 257 753 M 257 781 L 257 753 M 229 781 L 229 753 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.svg b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.svg
index 575c29a..7d38d2a 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.svg
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 729.5 L 1107.5 729.5 L 1107.5 844.5 L 1066.5 844.5 Z M 822.5 729.5 L 863.5 729.5 L 863.5 844.5 L 822.5 844.5 Z M 951.5 729.5 L 992.5 729.5 L 992.5 844.5 L 951.5 844.5 Z M 951.5 729.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 822.5 228.5 L 863.5 228.5 L 863.5 502.5 L 822.5 502.5 Z M 951.5 228.5 L 992.5 228.5 L 992.5 502.5 L 951.5 502.5 Z M 951.5 228.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.svg b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.svg
index 0d69da1..d0e70c4 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.svg
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" 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="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1180.5 729.5 L 1221.5 729.5 L 1221.5 844.5 L 1180.5 844.5 Z M 694.5 729.5 L 735.5 729.5 L 735.5 844.5 L 694.5 844.5 Z M 827.5 729.5 L 868.5 729.5 L 868.5 844.5 L 827.5 844.5 Z M 945.5 729.5 L 986.5 729.5 L 986.5 844.5 L 945.5 844.5 Z M 1062.5 729.5 L 1103.5 729.5 L 1103.5 844.5 L 1062.5 844.5 Z M 1062.5 729.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1178.5 228.5 L 1220.5 228.5 L 1220.5 502.5 L 1178.5 502.5 Z M 694.5 228.5 L 735.5 228.5 L 735.5 502.5 L 694.5 502.5 Z M 826.5 228.5 L 867.5 228.5 L 867.5 502.5 L 826.5 502.5 Z M 943.5 228.5 L 984.5 228.5 L 984.5 502.5 L 943.5 502.5 Z M 1061.5 228.5 L 1102.5 228.5 L 1102.5 502.5 L 1061.5 502.5 Z M 1061.5 228.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.svg b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.svg
index 921d9c4..fe93732 100644
--- a/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.svg
+++ b/cells/clkbuf/sky130_fd_sc_hd__clkbuf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 307.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1436.5 729.5 L 1477.5 729.5 L 1477.5 844.5 L 1436.5 844.5 Z M 377.5 729.5 L 418.5 729.5 L 418.5 844.5 L 377.5 844.5 Z M 495.5 729.5 L 536.5 729.5 L 536.5 844.5 L 495.5 844.5 Z M 612.5 729.5 L 653.5 729.5 L 653.5 844.5 L 612.5 844.5 Z M 730.5 729.5 L 771.5 729.5 L 771.5 844.5 L 730.5 844.5 Z M 848.5 729.5 L 889.5 729.5 L 889.5 844.5 L 848.5 844.5 Z M 965.5 729.5 L 1006.5 729.5 L 1006.5 844.5 L 965.5 844.5 Z M 1083.5 729.5 L 1124.5 729.5 L 1124.5 844.5 L 1083.5 844.5 Z M 1200.5 729.5 L 1241.5 729.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1318.5 729.5 L 1359.5 729.5 L 1359.5 844.5 L 1318.5 844.5 Z M 1318.5 729.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1436.5 228.5 L 1477.5 228.5 L 1477.5 502.5 L 1436.5 502.5 Z M 377.5 228.5 L 418.5 228.5 L 418.5 502.5 L 377.5 502.5 Z M 495.5 228.5 L 536.5 228.5 L 536.5 502.5 L 495.5 502.5 Z M 612.5 228.5 L 653.5 228.5 L 653.5 502.5 L 612.5 502.5 Z M 730.5 228.5 L 771.5 228.5 L 771.5 502.5 L 730.5 502.5 Z M 848.5 228.5 L 889.5 228.5 L 889.5 502.5 L 848.5 502.5 Z M 965.5 228.5 L 1006.5 228.5 L 1006.5 502.5 L 965.5 502.5 Z M 1083.5 228.5 L 1124.5 228.5 L 1124.5 502.5 L 1083.5 502.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 502.5 L 1200.5 502.5 Z M 1318.5 228.5 L 1359.5 228.5 L 1359.5 502.5 L 1318.5 502.5 Z M 1318.5 228.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 307 938 L 354 938 M 307 892 L 354 892 M 307 892 L 307 938 M 354 892 L 354 938 " 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 307 938 L 354 938 M 307 892 L 354 892 M 354 938 L 354 892 M 307 938 L 307 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.svg b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.svg
index a3bbd95..38acd3b 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.svg
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" 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="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 1304.5 729.5 L 1345.5 729.5 L 1345.5 844.5 L 1304.5 844.5 Z M 567.5 729.5 L 608.5 729.5 L 608.5 844.5 L 567.5 844.5 Z M 802.5 666.5 L 843.5 666.5 L 843.5 844.5 L 802.5 844.5 Z M 802.5 666.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1069.5 228.5 L 1110.5 228.5 L 1110.5 453.5 L 1069.5 453.5 Z M 802.5 228.5 L 843.5 228.5 L 843.5 453.5 L 802.5 453.5 Z M 567.5 228.5 L 608.5 228.5 L 608.5 502.5 L 567.5 502.5 Z M 1304.5 228.5 L 1345.5 228.5 L 1345.5 502.5 L 1304.5 502.5 Z M 1304.5 228.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.svg b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.svg
index 476d217..3bb2c2a 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.svg
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_hd__clkdlybuf4s15_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image291"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 962.5 666.5 L 1003.5 666.5 L 1003.5 844.5 L 962.5 844.5 Z M 1315.5 729.5 L 1356.5 729.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1198.5 729.5 L 1239.5 729.5 L 1239.5 844.5 L 1198.5 844.5 Z M 506.5 729.5 L 547.5 729.5 L 547.5 844.5 L 506.5 844.5 Z M 666.5 666.5 L 707.5 666.5 L 707.5 844.5 L 666.5 844.5 Z M 666.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 962.5 228.5 L 1003.5 228.5 L 1003.5 453.5 L 962.5 453.5 Z M 666.5 228.5 L 707.5 228.5 L 707.5 453.5 L 666.5 453.5 Z M 1198.5 228.5 L 1239.5 228.5 L 1239.5 502.5 L 1198.5 502.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 506.5 228.5 L 547.5 228.5 L 547.5 502.5 L 506.5 502.5 Z M 506.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.svg b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.svg
index 0152636..04d2d0d 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.svg
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" 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="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1069.5 666.5 L 1118.5 666.5 L 1118.5 844.5 L 1069.5 844.5 Z M 1304.5 729.5 L 1345.5 729.5 L 1345.5 844.5 L 1304.5 844.5 Z M 567.5 729.5 L 608.5 729.5 L 608.5 844.5 L 567.5 844.5 Z M 794.5 666.5 L 843.5 666.5 L 843.5 844.5 L 794.5 844.5 Z M 794.5 666.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1069.5 228.5 L 1118.5 228.5 L 1118.5 453.5 L 1069.5 453.5 Z M 794.5 228.5 L 843.5 228.5 L 843.5 453.5 L 794.5 453.5 Z M 567.5 228.5 L 608.5 228.5 L 608.5 502.5 L 567.5 502.5 Z M 1304.5 228.5 L 1345.5 228.5 L 1345.5 502.5 L 1304.5 502.5 Z M 1304.5 228.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.svg b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.svg
index e7b49ee..07ff801 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.svg
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_hd__clkdlybuf4s18_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" 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="#image279"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 987.5 666.5 L 1036.5 666.5 L 1036.5 844.5 L 987.5 844.5 Z M 1284.5 729.5 L 1325.5 729.5 L 1325.5 844.5 L 1284.5 844.5 Z M 1166.5 729.5 L 1207.5 729.5 L 1207.5 844.5 L 1166.5 844.5 Z M 568.5 729.5 L 610.5 729.5 L 610.5 844.5 L 568.5 844.5 Z M 719.5 666.5 L 768.5 666.5 L 768.5 844.5 L 719.5 844.5 Z M 719.5 666.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 987.5 228.5 L 1036.5 228.5 L 1036.5 453.5 L 987.5 453.5 Z M 719.5 228.5 L 768.5 228.5 L 768.5 453.5 L 719.5 453.5 Z M 1166.5 228.5 L 1207.5 228.5 L 1207.5 502.5 L 1166.5 502.5 Z M 1284.5 228.5 L 1325.5 228.5 L 1325.5 502.5 L 1284.5 502.5 Z M 568.5 228.5 L 610.5 228.5 L 610.5 502.5 L 568.5 502.5 Z M 568.5 228.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.svg b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.svg
index e4ecaba..e4c09f2 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.svg
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1016.5 666.5 L 1084.5 666.5 L 1084.5 844.5 L 1016.5 844.5 Z M 1251.5 729.5 L 1292.5 729.5 L 1292.5 844.5 L 1251.5 844.5 Z M 568.5 729.5 L 610.5 729.5 L 610.5 844.5 L 568.5 844.5 Z M 723.5 666.5 L 791.5 666.5 L 791.5 844.5 L 723.5 844.5 Z M 723.5 666.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1016.5 228.5 L 1084.5 228.5 L 1084.5 453.5 L 1016.5 453.5 Z M 723.5 228.5 L 791.5 228.5 L 791.5 453.5 L 723.5 453.5 Z M 568.5 228.5 L 610.5 228.5 L 610.5 502.5 L 568.5 502.5 Z M 1251.5 228.5 L 1292.5 228.5 L 1292.5 502.5 L 1251.5 502.5 Z M 1251.5 228.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.svg b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.svg
index 426881b..6c00639 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.svg
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_hd__clkdlybuf4s25_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 982.5 666.5 L 1050.5 666.5 L 1050.5 844.5 L 982.5 844.5 Z M 1276.5 729.5 L 1317.5 729.5 L 1317.5 844.5 L 1276.5 844.5 Z M 1139.5 729.5 L 1180.5 729.5 L 1180.5 844.5 L 1139.5 844.5 Z M 567.5 729.5 L 608.5 729.5 L 608.5 844.5 L 567.5 844.5 Z M 697.5 666.5 L 765.5 666.5 L 765.5 844.5 L 697.5 844.5 Z M 697.5 666.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 982.5 228.5 L 1050.5 228.5 L 1050.5 453.5 L 982.5 453.5 Z M 697.5 228.5 L 765.5 228.5 L 765.5 453.5 L 697.5 453.5 Z M 1139.5 228.5 L 1180.5 228.5 L 1180.5 502.5 L 1139.5 502.5 Z M 1276.5 228.5 L 1317.5 228.5 L 1317.5 502.5 L 1276.5 502.5 Z M 567.5 228.5 L 608.5 228.5 L 608.5 502.5 L 567.5 502.5 Z M 567.5 228.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.svg b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.svg
index 72e830a..27aa28d 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.svg
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" 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="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1064.5 666.5 L 1200.5 666.5 L 1200.5 844.5 L 1064.5 844.5 Z M 1289.5 729.5 L 1330.5 729.5 L 1330.5 844.5 L 1289.5 844.5 Z M 568.5 729.5 L 610.5 729.5 L 610.5 844.5 L 568.5 844.5 Z M 708.5 666.5 L 845.5 666.5 L 845.5 844.5 L 708.5 844.5 Z M 708.5 666.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1064.5 228.5 L 1200.5 228.5 L 1200.5 453.5 L 1064.5 453.5 Z M 708.5 228.5 L 845.5 228.5 L 845.5 453.5 L 708.5 453.5 Z M 568.5 228.5 L 610.5 228.5 L 610.5 502.5 L 568.5 502.5 Z M 1289.5 228.5 L 1330.5 228.5 L 1330.5 502.5 L 1289.5 502.5 Z M 1289.5 228.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.svg b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.svg
index 8c64ca4..37aa42c 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.svg
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_hd__clkdlybuf4s50_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 999.5 666.5 L 1136.5 666.5 L 1136.5 844.5 L 999.5 844.5 Z M 1343.5 729.5 L 1384.5 729.5 L 1384.5 844.5 L 1343.5 844.5 Z M 1226.5 729.5 L 1267.5 729.5 L 1267.5 844.5 L 1226.5 844.5 Z M 506.5 729.5 L 547.5 729.5 L 547.5 844.5 L 506.5 844.5 Z M 645.5 666.5 L 782.5 666.5 L 782.5 844.5 L 645.5 844.5 Z M 645.5 666.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 228.5 L 1136.5 228.5 L 1136.5 453.5 L 999.5 453.5 Z M 645.5 228.5 L 782.5 228.5 L 782.5 453.5 L 645.5 453.5 Z M 1226.5 228.5 L 1267.5 228.5 L 1267.5 502.5 L 1226.5 502.5 Z M 1343.5 228.5 L 1384.5 228.5 L 1384.5 502.5 L 1343.5 502.5 Z M 506.5 228.5 L 547.5 228.5 L 547.5 502.5 L 506.5 502.5 Z M 506.5 228.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.svg b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.svg
index 91c8eaa..cdb72fc 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_1.svg
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image289"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 998.5 729.5 L 1039.5 729.5 L 1039.5 844.5 L 998.5 844.5 Z M 998.5 729.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 228.5 L 1040.5 228.5 L 1040.5 458.5 L 999.5 458.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 458.5 L 884.5 458.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 816 938 L 863 938 M 816 892 L 863 892 M 816 892 L 816 938 M 863 892 L 863 938 " 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 816 938 L 863 938 M 816 892 L 863 892 M 863 938 L 863 892 M 816 938 L 816 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.svg b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.svg
index ddfd5bf..d5b4c92 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_16.svg
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image300" 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="#image272"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1406.5 631.5 L 1426.5 631.5 L 1426.5 689.5 L 1406.5 689.5 Z M 493.5 631.5 L 514.5 631.5 L 514.5 689.5 L 493.5 689.5 Z M 552.5 631.5 L 573.5 631.5 L 573.5 689.5 L 552.5 689.5 Z M 611.5 631.5 L 632.5 631.5 L 632.5 689.5 L 611.5 689.5 Z M 670.5 631.5 L 691.5 631.5 L 691.5 689.5 L 670.5 689.5 Z M 729.5 631.5 L 750.5 631.5 L 750.5 689.5 L 729.5 689.5 Z M 789.5 631.5 L 809.5 631.5 L 809.5 689.5 L 789.5 689.5 Z M 852.5 631.5 L 873.5 631.5 L 873.5 689.5 L 852.5 689.5 Z M 933.5 631.5 L 953.5 631.5 L 953.5 689.5 L 933.5 689.5 Z M 992.5 631.5 L 1013.5 631.5 L 1013.5 689.5 L 992.5 689.5 Z M 1051.5 631.5 L 1072.5 631.5 L 1072.5 689.5 L 1051.5 689.5 Z M 1110.5 631.5 L 1131.5 631.5 L 1131.5 689.5 L 1110.5 689.5 Z M 1169.5 631.5 L 1190.5 631.5 L 1190.5 689.5 L 1169.5 689.5 Z M 1228.5 631.5 L 1249.5 631.5 L 1249.5 689.5 L 1228.5 689.5 Z M 1287.5 631.5 L 1308.5 631.5 L 1308.5 689.5 L 1287.5 689.5 Z M 1346.5 631.5 L 1367.5 631.5 L 1367.5 689.5 L 1346.5 689.5 Z M 1346.5 631.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1642.5 379.5 L 1662.5 379.5 L 1662.5 517.5 L 1642.5 517.5 Z M 257.5 379.5 L 277.5 379.5 L 277.5 517.5 L 257.5 517.5 Z M 316.5 379.5 L 336.5 379.5 L 336.5 517.5 L 316.5 517.5 Z M 375.5 379.5 L 396.5 379.5 L 396.5 517.5 L 375.5 517.5 Z M 434.5 379.5 L 455.5 379.5 L 455.5 517.5 L 434.5 517.5 Z M 493.5 379.5 L 514.5 379.5 L 514.5 517.5 L 493.5 517.5 Z M 552.5 379.5 L 573.5 379.5 L 573.5 517.5 L 552.5 517.5 Z M 611.5 379.5 L 632.5 379.5 L 632.5 517.5 L 611.5 517.5 Z M 670.5 379.5 L 691.5 379.5 L 691.5 517.5 L 670.5 517.5 Z M 729.5 379.5 L 750.5 379.5 L 750.5 517.5 L 729.5 517.5 Z M 789.5 379.5 L 809.5 379.5 L 809.5 517.5 L 789.5 517.5 Z M 852.5 379.5 L 873.5 379.5 L 873.5 517.5 L 852.5 517.5 Z M 933.5 379.5 L 953.5 379.5 L 953.5 517.5 L 933.5 517.5 Z M 992.5 379.5 L 1013.5 379.5 L 1013.5 517.5 L 992.5 517.5 Z M 1051.5 379.5 L 1072.5 379.5 L 1072.5 517.5 L 1051.5 517.5 Z M 1110.5 379.5 L 1131.5 379.5 L 1131.5 517.5 L 1110.5 517.5 Z M 1169.5 379.5 L 1190.5 379.5 L 1190.5 517.5 L 1169.5 517.5 Z M 1228.5 379.5 L 1249.5 379.5 L 1249.5 517.5 L 1228.5 517.5 Z M 1287.5 379.5 L 1308.5 379.5 L 1308.5 517.5 L 1287.5 517.5 Z M 1346.5 379.5 L 1367.5 379.5 L 1367.5 517.5 L 1346.5 517.5 Z M 1406.5 379.5 L 1426.5 379.5 L 1426.5 517.5 L 1406.5 517.5 Z M 1465.5 379.5 L 1485.5 379.5 L 1485.5 517.5 L 1465.5 517.5 Z M 1524.5 379.5 L 1544.5 379.5 L 1544.5 517.5 L 1524.5 517.5 Z M 1583.5 379.5 L 1603.5 379.5 L 1603.5 517.5 L 1583.5 517.5 Z M 1583.5 379.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 410.5 546.5 L 433.5 546.5 L 433.5 550.5 L 410.5 550.5 Z M 473.5 546.5 L 497.5 546.5 L 497.5 550.5 L 473.5 550.5 Z M 1485.5 546.5 L 1508.5 546.5 L 1508.5 550.5 L 1485.5 550.5 Z M 1548.5 546.5 L 1571.5 546.5 L 1571.5 550.5 L 1548.5 550.5 Z M 1485.5 550.5 L 1508.5 550.5 L 1508.5 569.5 L 1485.5 569.5 Z M 410.5 550.5 L 433.5 550.5 L 433.5 569.5 L 410.5 569.5 Z M 473.5 550.5 L 497.5 550.5 L 497.5 569.5 L 473.5 569.5 Z M 1548.5 550.5 L 1571.5 550.5 L 1571.5 569.5 L 1548.5 569.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface269">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -140,6 +140,5 @@
 <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 220 743 L 244 743 M 220 720 L 244 720 M 220 720 L 220 743 M 244 720 L 244 743 " 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 220 743 L 244 743 M 220 720 L 244 720 M 244 743 L 244 720 M 220 743 L 220 720 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.svg b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.svg
index dd9dd59..3b96858 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_2.svg
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 729.5 L 1107.5 729.5 L 1107.5 844.5 L 1066.5 844.5 Z M 949.5 729.5 L 990.5 729.5 L 990.5 844.5 L 949.5 844.5 Z M 949.5 729.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1062.5 228.5 L 1103.5 228.5 L 1103.5 502.5 L 1062.5 502.5 Z M 827.5 228.5 L 868.5 228.5 L 868.5 502.5 L 827.5 502.5 Z M 945.5 228.5 L 986.5 228.5 L 986.5 502.5 L 945.5 502.5 Z M 945.5 228.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image287" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.svg b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.svg
index 47f93c4..1b0ddf5 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_4.svg
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1113.5 729.5 L 1154.5 729.5 L 1154.5 844.5 L 1113.5 844.5 Z M 760.5 729.5 L 801.5 729.5 L 801.5 844.5 L 760.5 844.5 Z M 878.5 729.5 L 919.5 729.5 L 919.5 844.5 L 878.5 844.5 Z M 995.5 729.5 L 1036.5 729.5 L 1036.5 844.5 L 995.5 844.5 Z M 995.5 729.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1230.5 228.5 L 1272.5 228.5 L 1272.5 502.5 L 1230.5 502.5 Z M 642.5 228.5 L 683.5 228.5 L 683.5 502.5 L 642.5 502.5 Z M 760.5 228.5 L 801.5 228.5 L 801.5 502.5 L 760.5 502.5 Z M 878.5 228.5 L 919.5 228.5 L 919.5 502.5 L 878.5 502.5 Z M 995.5 228.5 L 1036.5 228.5 L 1036.5 502.5 L 995.5 502.5 Z M 1113.5 228.5 L 1154.5 228.5 L 1154.5 502.5 L 1113.5 502.5 Z M 1113.5 228.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.svg b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.svg
index a190eeb..d25fc47 100644
--- a/cells/clkinv/sky130_fd_sc_hd__clkinv_8.svg
+++ b/cells/clkinv/sky130_fd_sc_hd__clkinv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" 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="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1295.5 710.5 L 1332.5 710.5 L 1332.5 813.5 L 1295.5 813.5 Z M 552.5 710.5 L 589.5 710.5 L 589.5 813.5 L 552.5 813.5 Z M 658.5 710.5 L 695.5 710.5 L 695.5 813.5 L 658.5 813.5 Z M 764.5 710.5 L 801.5 710.5 L 801.5 813.5 L 764.5 813.5 Z M 870.5 710.5 L 907.5 710.5 L 907.5 813.5 L 870.5 813.5 Z M 976.5 710.5 L 1013.5 710.5 L 1013.5 813.5 L 976.5 813.5 Z M 1082.5 710.5 L 1119.5 710.5 L 1119.5 813.5 L 1082.5 813.5 Z M 1188.5 710.5 L 1225.5 710.5 L 1225.5 813.5 L 1188.5 813.5 Z M 1188.5 710.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1460.5 258.5 L 1497.5 258.5 L 1497.5 505.5 L 1460.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 423.5 258.5 L 460.5 258.5 L 460.5 505.5 L 423.5 505.5 Z M 528.5 258.5 L 565.5 258.5 L 565.5 505.5 L 528.5 505.5 Z M 631.5 258.5 L 668.5 258.5 L 668.5 505.5 L 631.5 505.5 Z M 735.5 258.5 L 772.5 258.5 L 772.5 505.5 L 735.5 505.5 Z M 838.5 258.5 L 875.5 258.5 L 875.5 505.5 L 838.5 505.5 Z M 942.5 258.5 L 979.5 258.5 L 979.5 505.5 L 942.5 505.5 Z M 1045.5 258.5 L 1082.5 258.5 L 1082.5 505.5 L 1045.5 505.5 Z M 1149.5 258.5 L 1186.5 258.5 L 1186.5 505.5 L 1149.5 505.5 Z M 1253.5 258.5 L 1290.5 258.5 L 1290.5 505.5 L 1253.5 505.5 Z M 1356.5 258.5 L 1393.5 258.5 L 1393.5 505.5 L 1356.5 505.5 Z M 1356.5 258.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.svg b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.svg
index 0e82fbf..468e8a9 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.svg
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" 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="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 983.5 666.5 L 1024.5 666.5 L 1024.5 816.5 L 983.5 816.5 Z M 876.5 666.5 L 917.5 666.5 L 917.5 816.5 L 876.5 816.5 Z M 876.5 666.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1002.5 228.5 L 1070.5 228.5 L 1070.5 502.5 L 1002.5 502.5 Z M 857.5 228.5 L 925.5 228.5 L 925.5 502.5 L 857.5 502.5 Z M 857.5 228.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.svg b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.svg
index d520915..74789d2 100644
--- a/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.svg
+++ b/cells/clkinvlp/sky130_fd_sc_hd__clkinvlp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1009.5 693.5 L 1050.5 693.5 L 1050.5 844.5 L 1009.5 844.5 Z M 694.5 693.5 L 735.5 693.5 L 735.5 844.5 L 694.5 844.5 Z M 793.5 693.5 L 834.5 693.5 L 834.5 844.5 L 793.5 844.5 Z M 910.5 693.5 L 951.5 693.5 L 951.5 844.5 L 910.5 844.5 Z M 910.5 693.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1129.5 228.5 L 1198.5 228.5 L 1198.5 502.5 L 1129.5 502.5 Z M 694.5 228.5 L 763.5 228.5 L 763.5 502.5 L 694.5 502.5 Z M 839.5 228.5 L 908.5 228.5 L 908.5 502.5 L 839.5 502.5 Z M 984.5 228.5 L 1053.5 228.5 L 1053.5 502.5 L 984.5 502.5 Z M 984.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/conb/sky130_fd_sc_hd__conb_1.svg b/cells/conb/sky130_fd_sc_hd__conb_1.svg
index cf8de25..2abcdb7 100644
--- a/cells/conb/sky130_fd_sc_hd__conb_1.svg
+++ b/cells/conb/sky130_fd_sc_hd__conb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image470" 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="#image443"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image443"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -29,9 +29,9 @@
 <clipPath id="clip5">
   <path d="M 994.5 579.5 L 1125.5 579.5 L 1125.5 591.5 L 994.5 591.5 Z M 805.5 579.5 L 936.5 579.5 L 936.5 591.5 L 805.5 591.5 Z M 805.5 579.5 "/>
 </clipPath>
-<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image444"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,15 +45,15 @@
 <clipPath id="clip8">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image445"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface440">
+<g id="surface467">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,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 900.488281 721.039062 L 900.488281 717.03125 L 901.683594 716.746094 L 902.777344 716.367188 L 903.734375 715.839844 L 904.496094 715.171875 L 905.066406 714.363281 L 905.542969 713.457031 L 905.640625 713.074219 L 905.734375 712.695312 L 905.785156 712.3125 L 905.878906 711.929688 L 905.878906 711.5 L 905.925781 711.121094 L 905.785156 709.878906 L 905.496094 708.785156 L 905.019531 707.78125 L 904.304688 706.875 L 903.398438 706.113281 L 902.351562 705.492188 L 901.445312 705.0625 L 900.488281 704.777344 L 899.488281 704.492188 L 898.34375 704.347656 L 897.199219 704.207031 L 895.960938 704.207031 L 894.148438 704.253906 L 892.574219 704.492188 L 891.144531 704.921875 L 889.902344 705.445312 L 888.808594 706.160156 L 887.902344 707.066406 L 887.425781 707.640625 L 887.089844 708.257812 L 886.804688 708.925781 L 886.613281 709.640625 L 886.46875 710.40625 L 886.46875 711.214844 L 886.613281 712.789062 L 887.136719 714.125 L 887.949219 715.269531 L 889.140625 716.175781 L 890.621094 716.84375 L 892.480469 717.320312 L 892.480469 721.324219 L 890.667969 721.085938 L 889.09375 720.65625 L 887.664062 720.039062 L 886.421875 719.226562 L 885.324219 718.226562 L 884.421875 717.082031 L 883.894531 716.222656 L 883.515625 715.316406 L 883.226562 714.363281 L 882.988281 713.3125 L 882.847656 712.214844 L 882.796875 711.121094 L 882.941406 709.449219 L 883.226562 707.925781 L 883.753906 706.496094 L 884.421875 705.207031 L 885.324219 704.015625 L 886.46875 702.964844 L 887.664062 702.058594 L 889.046875 701.296875 L 890.570312 700.773438 L 892.242188 700.34375 L 894.003906 700.105469 L 895.960938 700.058594 L 898.011719 700.105469 L 899.917969 700.390625 L 901.683594 700.867188 L 903.304688 701.488281 L 904.78125 702.296875 L 906.117188 703.300781 L 907.167969 704.347656 L 908.023438 705.492188 L 908.691406 706.734375 L 909.167969 708.117188 L 909.457031 709.59375 L 909.597656 711.167969 L 909.457031 712.933594 L 909.167969 714.554688 L 908.597656 716.03125 L 907.882812 717.320312 L 906.878906 718.414062 L 905.734375 719.371094 L 904.972656 719.796875 L 904.210938 720.179688 L 903.351562 720.464844 L 902.445312 720.753906 L 901.492188 720.894531 Z M 900.488281 721.039062 "/>
 <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 918.660156 729.144531 L 898.296875 729.144531 L 908.882812 739.730469 L 908.882812 744.832031 L 900.25 736.15625 L 883.894531 746.359375 L 883.894531 741.449219 L 897.4375 733.007812 L 893.625 729.144531 L 883.894531 729.144531 L 883.894531 725.1875 L 918.660156 725.1875 Z M 918.660156 729.144531 "/>
 <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 776 167 L 776 174 M 772 171 L 779 171 M 838 539 L 838 548 M 833 544 L 842 544 M 1095 539 L 1095 548 M 1090 544 L 1099 544 M 1031 519 L 1031 528 M 1026 524 L 1035 524 M 890 519 L 890 528 M 885 524 L 894 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hd__decap_12.svg b/cells/decap/sky130_fd_sc_hd__decap_12.svg
index 782caaa..28364ac 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_12.svg
+++ b/cells/decap/sky130_fd_sc_hd__decap_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" 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="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 331.5 689.5 L 1589.5 689.5 L 1589.5 835.5 L 331.5 835.5 Z M 331.5 689.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 331.5 237.5 L 1589.5 237.5 L 1589.5 468.5 L 331.5 468.5 Z M 331.5 237.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <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 264 204 L 310 204 M 264 159 L 310 159 M 264 159 L 264 204 M 310 159 L 310 204 " 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 264 204 L 310 204 M 264 159 L 310 159 M 310 204 L 310 159 M 264 204 L 264 159 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hd__decap_3.svg b/cells/decap/sky130_fd_sc_hd__decap_3.svg
index 892f936..ff0fb99 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_3.svg
+++ b/cells/decap/sky130_fd_sc_hd__decap_3.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image264" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image291" 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="#image264"/>
+  <use xlink:href="#image291"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image264"/>
+  <use xlink:href="#image291"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 884.5 693.5 L 1046.5 693.5 L 1046.5 844.5 L 884.5 844.5 Z M 884.5 693.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image292"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 884.5 228.5 L 1046.5 228.5 L 1046.5 466.5 L 884.5 466.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface261">
+<g id="surface288">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <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 816 194 L 863 194 M 816 148 L 863 148 M 816 148 L 816 194 M 863 148 L 863 194 " 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 816 194 L 863 194 M 816 148 L 863 148 M 863 194 L 863 148 M 816 194 L 816 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hd__decap_4.svg b/cells/decap/sky130_fd_sc_hd__decap_4.svg
index b6ed7c9..de8bd89 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_4.svg
+++ b/cells/decap/sky130_fd_sc_hd__decap_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" 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="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 820.5 693.5 L 1107.5 693.5 L 1107.5 844.5 L 820.5 844.5 Z M 820.5 693.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 820.5 228.5 L 1107.5 228.5 L 1107.5 466.5 L 820.5 466.5 Z M 820.5 228.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hd__decap_6.svg b/cells/decap/sky130_fd_sc_hd__decap_6.svg
index 9eb853e..251c399 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_6.svg
+++ b/cells/decap/sky130_fd_sc_hd__decap_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" 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="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 693.5 693.5 L 1232.5 693.5 L 1232.5 844.5 L 693.5 844.5 Z M 693.5 693.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 693.5 228.5 L 1232.5 228.5 L 1232.5 466.5 L 693.5 466.5 Z M 693.5 228.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hd__decap_8.svg b/cells/decap/sky130_fd_sc_hd__decap_8.svg
index 83bef1b..2f9e03d 100644
--- a/cells/decap/sky130_fd_sc_hd__decap_8.svg
+++ b/cells/decap/sky130_fd_sc_hd__decap_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" 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="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 693.5 L 1356.5 693.5 L 1356.5 844.5 L 566.5 844.5 Z M 566.5 693.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 1356.5 228.5 L 1356.5 466.5 L 566.5 466.5 Z M 566.5 228.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.svg b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.svg
index c91ce4b..dd414e8 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.svg
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 541.5 L 174.5 541.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image440" 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="#image413"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 217.5 696.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image413"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1650.5 594.5 L 1669.5 594.5 L 1669.5 677.5 L 1650.5 677.5 Z M 549.5 631.5 L 568.5 631.5 L 568.5 677.5 L 549.5 677.5 Z M 482.5 631.5 L 501.5 631.5 L 501.5 677.5 L 482.5 677.5 Z M 1046.5 631.5 L 1065.5 631.5 L 1065.5 677.5 L 1046.5 677.5 Z M 993.5 631.5 L 1012.5 631.5 L 1012.5 677.5 L 993.5 677.5 Z M 249.5 624.5 L 268.5 624.5 L 268.5 677.5 L 249.5 677.5 Z M 1590.5 624.5 L 1609.5 624.5 L 1609.5 677.5 L 1590.5 677.5 Z M 1168.5 624.5 L 1187.5 624.5 L 1187.5 677.5 L 1168.5 677.5 Z M 1106.5 624.5 L 1125.5 624.5 L 1125.5 677.5 L 1106.5 677.5 Z M 421.5 624.5 L 441.5 624.5 L 441.5 677.5 L 421.5 677.5 Z M 1410.5 624.5 L 1429.5 624.5 L 1429.5 677.5 L 1410.5 677.5 Z M 302.5 624.5 L 321.5 624.5 L 321.5 677.5 L 302.5 677.5 Z M 610.5 624.5 L 629.5 624.5 L 629.5 677.5 L 610.5 677.5 Z M 682.5 624.5 L 701.5 624.5 L 701.5 677.5 L 682.5 677.5 Z M 743.5 596.5 L 762.5 596.5 L 762.5 677.5 L 743.5 677.5 Z M 797.5 596.5 L 816.5 596.5 L 816.5 677.5 L 797.5 677.5 Z M 1290.5 596.5 L 1309.5 596.5 L 1309.5 677.5 L 1290.5 677.5 Z M 1237.5 596.5 L 1256.5 596.5 L 1256.5 677.5 L 1237.5 677.5 Z M 916.5 596.5 L 935.5 596.5 L 935.5 677.5 L 916.5 677.5 Z M 1470.5 594.5 L 1489.5 594.5 L 1489.5 677.5 L 1470.5 677.5 Z M 1470.5 594.5 "/>
 </clipPath>
-<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image441" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image441"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1098.5 391.5 L 1117.5 391.5 L 1117.5 444.5 L 1098.5 444.5 Z M 480.5 391.5 L 499.5 391.5 L 499.5 444.5 L 480.5 444.5 Z M 533.5 391.5 L 552.5 391.5 L 552.5 444.5 L 533.5 444.5 Z M 978.5 391.5 L 997.5 391.5 L 997.5 444.5 L 978.5 444.5 Z M 421.5 391.5 L 441.5 391.5 L 441.5 444.5 L 421.5 444.5 Z M 610.5 391.5 L 629.5 391.5 L 629.5 444.5 L 610.5 444.5 Z M 1031.5 391.5 L 1050.5 391.5 L 1050.5 444.5 L 1031.5 444.5 Z M 677.5 391.5 L 696.5 391.5 L 696.5 444.5 L 677.5 444.5 Z M 1175.5 391.5 L 1194.5 391.5 L 1194.5 444.5 L 1175.5 444.5 Z M 249.5 395.5 L 268.5 395.5 L 268.5 476.5 L 249.5 476.5 Z M 302.5 395.5 L 321.5 395.5 L 321.5 476.5 L 302.5 476.5 Z M 1590.5 401.5 L 1609.5 401.5 L 1609.5 482.5 L 1590.5 482.5 Z M 1288.5 391.5 L 1307.5 391.5 L 1307.5 498.5 L 1288.5 498.5 Z M 799.5 391.5 L 818.5 391.5 L 818.5 498.5 L 799.5 498.5 Z M 1243.5 391.5 L 1262.5 391.5 L 1262.5 498.5 L 1243.5 498.5 Z M 886.5 391.5 L 905.5 391.5 L 905.5 498.5 L 886.5 498.5 Z M 746.5 391.5 L 765.5 391.5 L 765.5 498.5 L 746.5 498.5 Z M 1408.5 434.5 L 1428.5 434.5 L 1428.5 515.5 L 1408.5 515.5 Z M 1470.5 391.5 L 1489.5 391.5 L 1489.5 518.5 L 1470.5 518.5 Z M 1650.5 391.5 L 1669.5 391.5 L 1669.5 518.5 L 1650.5 518.5 Z M 1650.5 391.5 "/>
 </clipPath>
-<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image415"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 334.5 458.5 L 355.5 458.5 L 355.5 468.5 L 334.5 468.5 Z M 977.5 458.5 L 999.5 458.5 L 999.5 475.5 L 977.5 475.5 Z M 977.5 475.5 L 999.5 475.5 L 999.5 480.5 L 977.5 480.5 Z M 334.5 468.5 L 355.5 468.5 L 355.5 480.5 L 334.5 480.5 Z M 509.5 458.5 L 531.5 458.5 L 531.5 480.5 L 509.5 480.5 Z M 1325.5 501.5 L 1346.5 501.5 L 1346.5 523.5 L 1325.5 523.5 Z M 919.5 501.5 L 940.5 501.5 L 940.5 523.5 L 919.5 523.5 Z M 977.5 545.5 L 999.5 545.5 L 999.5 566.5 L 977.5 566.5 Z M 685.5 588.5 L 706.5 588.5 L 706.5 593.5 L 685.5 593.5 Z M 1162.5 588.5 L 1183.5 588.5 L 1183.5 593.5 L 1162.5 593.5 Z M 568.5 588.5 L 589.5 588.5 L 589.5 599.5 L 568.5 599.5 Z M 1162.5 593.5 L 1183.5 593.5 L 1183.5 610.5 L 1162.5 610.5 Z M 276.5 588.5 L 297.5 588.5 L 297.5 610.5 L 276.5 610.5 Z M 568.5 599.5 L 589.5 599.5 L 589.5 610.5 L 568.5 610.5 Z M 685.5 593.5 L 706.5 593.5 L 706.5 610.5 L 685.5 610.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.5 "/>
 </clipPath>
-<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image416"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface410">
+<g id="surface437">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -216,6 +216,5 @@
 <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 228 368 L 228 375 M 224 372 L 231 372 " 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 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 198 369 L 198 374 M 195 372 L 200 372 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.svg b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.svg
index 562fed0..d704ad2 100644
--- a/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.svg
+++ b/cells/dfbbn/sky130_fd_sc_hd__dfbbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 350.5 L 1743.5 350.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 350.5 "/>
 </clipPath>
-<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image442" 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="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 214.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1607.5 590.5 L 1625.5 590.5 L 1625.5 667.5 L 1607.5 667.5 Z M 923.5 624.5 L 940.5 624.5 L 940.5 667.5 L 923.5 667.5 Z M 524.5 624.5 L 542.5 624.5 L 542.5 667.5 L 524.5 667.5 Z M 461.5 624.5 L 478.5 624.5 L 478.5 667.5 L 461.5 667.5 Z M 987.5 624.5 L 1005.5 624.5 L 1005.5 667.5 L 987.5 667.5 Z M 404.5 617.5 L 422.5 617.5 L 422.5 667.5 L 404.5 667.5 Z M 1327.5 617.5 L 1345.5 617.5 L 1345.5 667.5 L 1327.5 667.5 Z M 1551.5 617.5 L 1568.5 617.5 L 1568.5 667.5 L 1551.5 667.5 Z M 646.5 617.5 L 664.5 617.5 L 664.5 667.5 L 646.5 667.5 Z M 1094.5 617.5 L 1112.5 617.5 L 1112.5 667.5 L 1094.5 667.5 Z M 1043.5 617.5 L 1061.5 617.5 L 1061.5 667.5 L 1043.5 667.5 Z M 293.5 617.5 L 311.5 617.5 L 311.5 667.5 L 293.5 667.5 Z M 581.5 617.5 L 599.5 617.5 L 599.5 667.5 L 581.5 667.5 Z M 243.5 617.5 L 261.5 617.5 L 261.5 667.5 L 243.5 667.5 Z M 866.5 591.5 L 884.5 591.5 L 884.5 667.5 L 866.5 667.5 Z M 706.5 591.5 L 723.5 591.5 L 723.5 667.5 L 706.5 667.5 Z M 1164.5 591.5 L 1182.5 591.5 L 1182.5 667.5 L 1164.5 667.5 Z M 1214.5 591.5 L 1232.5 591.5 L 1232.5 667.5 L 1214.5 667.5 Z M 755.5 591.5 L 773.5 591.5 L 773.5 667.5 L 755.5 667.5 Z M 1656.5 590.5 L 1674.5 590.5 L 1674.5 667.5 L 1656.5 667.5 Z M 1435.5 590.5 L 1452.5 590.5 L 1452.5 667.5 L 1435.5 667.5 Z M 1385.5 590.5 L 1403.5 590.5 L 1403.5 667.5 L 1385.5 667.5 Z M 1385.5 590.5 "/>
 </clipPath>
-<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image415"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1043.5 401.5 L 1061.5 401.5 L 1061.5 450.5 L 1043.5 450.5 Z M 461.5 401.5 L 478.5 401.5 L 478.5 450.5 L 461.5 450.5 Z M 510.5 401.5 L 528.5 401.5 L 528.5 450.5 L 510.5 450.5 Z M 924.5 401.5 L 942.5 401.5 L 942.5 450.5 L 924.5 450.5 Z M 404.5 401.5 L 422.5 401.5 L 422.5 450.5 L 404.5 450.5 Z M 581.5 401.5 L 599.5 401.5 L 599.5 450.5 L 581.5 450.5 Z M 974.5 401.5 L 991.5 401.5 L 991.5 450.5 L 974.5 450.5 Z M 644.5 401.5 L 662.5 401.5 L 662.5 450.5 L 644.5 450.5 Z M 1107.5 401.5 L 1125.5 401.5 L 1125.5 450.5 L 1107.5 450.5 Z M 243.5 404.5 L 261.5 404.5 L 261.5 480.5 L 243.5 480.5 Z M 293.5 404.5 L 311.5 404.5 L 311.5 480.5 L 293.5 480.5 Z M 1551.5 410.5 L 1568.5 410.5 L 1568.5 486.5 L 1551.5 486.5 Z M 839.5 401.5 L 856.5 401.5 L 856.5 500.5 L 839.5 500.5 Z M 1207.5 401.5 L 1225.5 401.5 L 1225.5 500.5 L 1207.5 500.5 Z M 708.5 401.5 L 726.5 401.5 L 726.5 500.5 L 708.5 500.5 Z M 755.5 401.5 L 773.5 401.5 L 773.5 500.5 L 755.5 500.5 Z M 1164.5 401.5 L 1182.5 401.5 L 1182.5 500.5 L 1164.5 500.5 Z M 1327.5 441.5 L 1345.5 441.5 L 1345.5 517.5 L 1327.5 517.5 Z M 1607.5 401.5 L 1625.5 401.5 L 1625.5 519.5 L 1607.5 519.5 Z M 1435.5 401.5 L 1452.5 401.5 L 1452.5 519.5 L 1435.5 519.5 Z M 1656.5 401.5 L 1674.5 401.5 L 1674.5 519.5 L 1656.5 519.5 Z M 1385.5 401.5 L 1403.5 401.5 L 1403.5 519.5 L 1385.5 519.5 Z M 1385.5 401.5 "/>
 </clipPath>
-<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image416"/>
+  <use xlink:href="#image444"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 214.5 363.5 L 234.5 363.5 L 234.5 383.5 L 214.5 383.5 Z M 1684.5 363.5 L 1704.5 363.5 L 1704.5 383.5 L 1684.5 383.5 Z M 1629.5 363.5 L 1649.5 363.5 L 1649.5 383.5 L 1629.5 383.5 Z M 1575.5 363.5 L 1595.5 363.5 L 1595.5 383.5 L 1575.5 383.5 Z M 1520.5 363.5 L 1541.5 363.5 L 1541.5 383.5 L 1520.5 383.5 Z M 1466.5 363.5 L 1486.5 363.5 L 1486.5 383.5 L 1466.5 383.5 Z M 1412.5 363.5 L 1432.5 363.5 L 1432.5 383.5 L 1412.5 383.5 Z M 1357.5 363.5 L 1377.5 363.5 L 1377.5 383.5 L 1357.5 383.5 Z M 1303.5 363.5 L 1323.5 363.5 L 1323.5 383.5 L 1303.5 383.5 Z M 1248.5 363.5 L 1268.5 363.5 L 1268.5 383.5 L 1248.5 383.5 Z M 1194.5 363.5 L 1214.5 363.5 L 1214.5 383.5 L 1194.5 383.5 Z M 1139.5 363.5 L 1159.5 363.5 L 1159.5 383.5 L 1139.5 383.5 Z M 1085.5 363.5 L 1105.5 363.5 L 1105.5 383.5 L 1085.5 383.5 Z M 1030.5 363.5 L 1051.5 363.5 L 1051.5 383.5 L 1030.5 383.5 Z M 976.5 363.5 L 996.5 363.5 L 996.5 383.5 L 976.5 383.5 Z M 922.5 363.5 L 942.5 363.5 L 942.5 383.5 L 922.5 383.5 Z M 867.5 363.5 L 887.5 363.5 L 887.5 383.5 L 867.5 383.5 Z M 813.5 363.5 L 833.5 363.5 L 833.5 383.5 L 813.5 383.5 Z M 758.5 363.5 L 778.5 363.5 L 778.5 383.5 L 758.5 383.5 Z M 704.5 363.5 L 724.5 363.5 L 724.5 383.5 L 704.5 383.5 Z M 649.5 363.5 L 669.5 363.5 L 669.5 383.5 L 649.5 383.5 Z M 595.5 363.5 L 615.5 363.5 L 615.5 383.5 L 595.5 383.5 Z M 540.5 363.5 L 561.5 363.5 L 561.5 383.5 L 540.5 383.5 Z M 486.5 363.5 L 506.5 363.5 L 506.5 383.5 L 486.5 383.5 Z M 432.5 363.5 L 452.5 363.5 L 452.5 383.5 L 432.5 383.5 Z M 377.5 363.5 L 397.5 363.5 L 397.5 383.5 L 377.5 383.5 Z M 323.5 363.5 L 343.5 363.5 L 343.5 383.5 L 323.5 383.5 Z M 268.5 363.5 L 288.5 363.5 L 288.5 383.5 L 268.5 383.5 Z M 323.5 463.5 L 343.5 463.5 L 343.5 473.5 L 323.5 473.5 Z M 923.5 463.5 L 943.5 463.5 L 943.5 479.5 L 923.5 479.5 Z M 923.5 479.5 L 943.5 479.5 L 943.5 483.5 L 923.5 483.5 Z M 323.5 473.5 L 343.5 473.5 L 343.5 483.5 L 323.5 483.5 Z M 488.5 463.5 L 508.5 463.5 L 508.5 483.5 L 488.5 483.5 Z M 869.5 504.5 L 889.5 504.5 L 889.5 524.5 L 869.5 524.5 Z M 1250.5 504.5 L 1270.5 504.5 L 1270.5 524.5 L 1250.5 524.5 Z M 923.5 544.5 L 943.5 544.5 L 943.5 564.5 L 923.5 564.5 Z M 651.5 584.5 L 671.5 584.5 L 671.5 589.5 L 651.5 589.5 Z M 1087.5 584.5 L 1107.5 584.5 L 1107.5 589.5 L 1087.5 589.5 Z M 540.5 584.5 L 560.5 584.5 L 560.5 595.5 L 540.5 595.5 Z M 1087.5 589.5 L 1107.5 589.5 L 1107.5 604.5 L 1087.5 604.5 Z M 651.5 589.5 L 671.5 589.5 L 671.5 604.5 L 651.5 604.5 Z M 540.5 595.5 L 560.5 595.5 L 560.5 604.5 L 540.5 604.5 Z M 269.5 584.5 L 289.5 584.5 L 289.5 604.5 L 269.5 604.5 Z M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 1684.5 685.5 L 1704.5 685.5 L 1704.5 705.5 L 1684.5 705.5 Z M 1629.5 685.5 L 1649.5 685.5 L 1649.5 705.5 L 1629.5 705.5 Z M 1575.5 685.5 L 1595.5 685.5 L 1595.5 705.5 L 1575.5 705.5 Z M 1520.5 685.5 L 1541.5 685.5 L 1541.5 705.5 L 1520.5 705.5 Z M 1466.5 685.5 L 1486.5 685.5 L 1486.5 705.5 L 1466.5 705.5 Z M 1412.5 685.5 L 1432.5 685.5 L 1432.5 705.5 L 1412.5 705.5 Z M 1357.5 685.5 L 1377.5 685.5 L 1377.5 705.5 L 1357.5 705.5 Z M 1303.5 685.5 L 1323.5 685.5 L 1323.5 705.5 L 1303.5 705.5 Z M 1248.5 685.5 L 1268.5 685.5 L 1268.5 705.5 L 1248.5 705.5 Z M 1194.5 685.5 L 1214.5 685.5 L 1214.5 705.5 L 1194.5 705.5 Z M 1139.5 685.5 L 1159.5 685.5 L 1159.5 705.5 L 1139.5 705.5 Z M 1085.5 685.5 L 1105.5 685.5 L 1105.5 705.5 L 1085.5 705.5 Z M 1030.5 685.5 L 1051.5 685.5 L 1051.5 705.5 L 1030.5 705.5 Z M 976.5 685.5 L 996.5 685.5 L 996.5 705.5 L 976.5 705.5 Z M 922.5 685.5 L 942.5 685.5 L 942.5 705.5 L 922.5 705.5 Z M 867.5 685.5 L 887.5 685.5 L 887.5 705.5 L 867.5 705.5 Z M 813.5 685.5 L 833.5 685.5 L 833.5 705.5 L 813.5 705.5 Z M 758.5 685.5 L 778.5 685.5 L 778.5 705.5 L 758.5 705.5 Z M 704.5 685.5 L 724.5 685.5 L 724.5 705.5 L 704.5 705.5 Z M 649.5 685.5 L 669.5 685.5 L 669.5 705.5 L 649.5 705.5 Z M 595.5 685.5 L 615.5 685.5 L 615.5 705.5 L 595.5 705.5 Z M 540.5 685.5 L 561.5 685.5 L 561.5 705.5 L 540.5 705.5 Z M 486.5 685.5 L 506.5 685.5 L 506.5 705.5 L 486.5 705.5 Z M 432.5 685.5 L 452.5 685.5 L 452.5 705.5 L 432.5 705.5 Z M 377.5 685.5 L 397.5 685.5 L 397.5 705.5 L 377.5 705.5 Z M 323.5 685.5 L 343.5 685.5 L 343.5 705.5 L 323.5 705.5 Z M 268.5 685.5 L 288.5 685.5 L 288.5 705.5 L 268.5 705.5 Z M 268.5 685.5 "/>
 </clipPath>
-<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image445"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface411">
+<g id="surface439">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -216,6 +216,5 @@
 <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 224 380 L 224 387 M 220 384 L 227 384 " 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 224 384 L 224 384 M 224 384 L 224 384 M 224 384 L 224 384 M 224 384 L 224 384 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 197 381 L 197 386 M 194 384 L 199 384 " 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 197 379 L 197 388 M 192 384 L 201 384 M 196 385 L 198 385 M 196 383 L 198 383 M 196 383 L 196 385 M 198 383 L 198 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.svg b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.svg
index 2c83801..71b0974 100644
--- a/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.svg
+++ b/cells/dfbbp/sky130_fd_sc_hd__dfbbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 541.5 L 174.5 541.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" 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="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 217.5 696.5 L 239.5 696.5 L 239.5 718.5 L 217.5 718.5 Z M 217.5 696.5 "/>
 </clipPath>
 <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="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1650.5 594.5 L 1669.5 594.5 L 1669.5 677.5 L 1650.5 677.5 Z M 549.5 631.5 L 568.5 631.5 L 568.5 677.5 L 549.5 677.5 Z M 482.5 631.5 L 501.5 631.5 L 501.5 677.5 L 482.5 677.5 Z M 1047.5 631.5 L 1066.5 631.5 L 1066.5 677.5 L 1047.5 677.5 Z M 977.5 631.5 L 996.5 631.5 L 996.5 677.5 L 977.5 677.5 Z M 249.5 624.5 L 268.5 624.5 L 268.5 677.5 L 249.5 677.5 Z M 1590.5 624.5 L 1609.5 624.5 L 1609.5 677.5 L 1590.5 677.5 Z M 1162.5 624.5 L 1181.5 624.5 L 1181.5 677.5 L 1162.5 677.5 Z M 1107.5 624.5 L 1126.5 624.5 L 1126.5 677.5 L 1107.5 677.5 Z M 421.5 624.5 L 441.5 624.5 L 441.5 677.5 L 421.5 677.5 Z M 1410.5 624.5 L 1429.5 624.5 L 1429.5 677.5 L 1410.5 677.5 Z M 302.5 624.5 L 321.5 624.5 L 321.5 677.5 L 302.5 677.5 Z M 610.5 624.5 L 629.5 624.5 L 629.5 677.5 L 610.5 677.5 Z M 680.5 624.5 L 699.5 624.5 L 699.5 677.5 L 680.5 677.5 Z M 744.5 596.5 L 763.5 596.5 L 763.5 677.5 L 744.5 677.5 Z M 797.5 596.5 L 816.5 596.5 L 816.5 677.5 L 797.5 677.5 Z M 1290.5 596.5 L 1309.5 596.5 L 1309.5 677.5 L 1290.5 677.5 Z M 1237.5 596.5 L 1256.5 596.5 L 1256.5 677.5 L 1237.5 677.5 Z M 917.5 596.5 L 936.5 596.5 L 936.5 677.5 L 917.5 677.5 Z M 1470.5 594.5 L 1489.5 594.5 L 1489.5 677.5 L 1470.5 677.5 Z M 1470.5 594.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1107.5 391.5 L 1126.5 391.5 L 1126.5 444.5 L 1107.5 444.5 Z M 481.5 391.5 L 500.5 391.5 L 500.5 444.5 L 481.5 444.5 Z M 534.5 391.5 L 553.5 391.5 L 553.5 444.5 L 534.5 444.5 Z M 979.5 391.5 L 998.5 391.5 L 998.5 444.5 L 979.5 444.5 Z M 421.5 391.5 L 441.5 391.5 L 441.5 444.5 L 421.5 444.5 Z M 610.5 391.5 L 629.5 391.5 L 629.5 444.5 L 610.5 444.5 Z M 1032.5 391.5 L 1051.5 391.5 L 1051.5 444.5 L 1032.5 444.5 Z M 678.5 391.5 L 697.5 391.5 L 697.5 444.5 L 678.5 444.5 Z M 1176.5 391.5 L 1195.5 391.5 L 1195.5 444.5 L 1176.5 444.5 Z M 249.5 395.5 L 268.5 395.5 L 268.5 476.5 L 249.5 476.5 Z M 302.5 395.5 L 321.5 395.5 L 321.5 476.5 L 302.5 476.5 Z M 1590.5 401.5 L 1609.5 401.5 L 1609.5 482.5 L 1590.5 482.5 Z M 1283.5 391.5 L 1302.5 391.5 L 1302.5 498.5 L 1283.5 498.5 Z M 800.5 391.5 L 819.5 391.5 L 819.5 498.5 L 800.5 498.5 Z M 1237.5 391.5 L 1256.5 391.5 L 1256.5 498.5 L 1237.5 498.5 Z M 887.5 391.5 L 906.5 391.5 L 906.5 498.5 L 887.5 498.5 Z M 746.5 391.5 L 766.5 391.5 L 766.5 498.5 L 746.5 498.5 Z M 1408.5 434.5 L 1428.5 434.5 L 1428.5 515.5 L 1408.5 515.5 Z M 1470.5 391.5 L 1489.5 391.5 L 1489.5 518.5 L 1470.5 518.5 Z M 1650.5 391.5 L 1669.5 391.5 L 1669.5 518.5 L 1650.5 518.5 Z M 1650.5 391.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 978.5 458.5 L 1000.5 458.5 L 1000.5 475.5 L 978.5 475.5 Z M 978.5 475.5 L 1000.5 475.5 L 1000.5 480.5 L 978.5 480.5 Z M 510.5 458.5 L 532.5 458.5 L 532.5 480.5 L 510.5 480.5 Z M 276.5 458.5 L 297.5 458.5 L 297.5 480.5 L 276.5 480.5 Z M 1329.5 501.5 L 1351.5 501.5 L 1351.5 523.5 L 1329.5 523.5 Z M 919.5 501.5 L 941.5 501.5 L 941.5 523.5 L 919.5 523.5 Z M 978.5 545.5 L 1000.5 545.5 L 1000.5 566.5 L 978.5 566.5 Z M 685.5 588.5 L 707.5 588.5 L 707.5 593.5 L 685.5 593.5 Z M 1153.5 588.5 L 1175.5 588.5 L 1175.5 593.5 L 1153.5 593.5 Z M 566.5 588.5 L 587.5 588.5 L 587.5 599.5 L 566.5 599.5 Z M 1153.5 593.5 L 1175.5 593.5 L 1175.5 610.5 L 1153.5 610.5 Z M 334.5 588.5 L 356.5 588.5 L 356.5 610.5 L 334.5 610.5 Z M 566.5 599.5 L 587.5 599.5 L 587.5 610.5 L 566.5 610.5 Z M 685.5 593.5 L 707.5 593.5 L 707.5 610.5 L 685.5 610.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface398">
+<g id="surface425">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -212,6 +212,5 @@
 <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 228 368 L 228 375 M 224 372 L 231 372 " 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 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1403 534 L 1424 534 M 1403 513 L 1424 513 M 1403 513 L 1403 534 M 1424 513 L 1424 534 M 198 369 L 198 374 M 195 372 L 200 372 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.svg b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.svg
index 7dd22ed..7389f8c 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.svg
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 312.5 L 1743.5 312.5 L 1743.5 542.5 L 174.5 542.5 Z M 174.5 312.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image367" 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="#image367"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 222.5 717.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1630.5 602.5 L 1652.5 602.5 L 1652.5 695.5 L 1630.5 695.5 Z M 569.5 644.5 L 590.5 644.5 L 590.5 695.5 L 569.5 695.5 Z M 973.5 644.5 L 994.5 644.5 L 994.5 695.5 L 973.5 695.5 Z M 1051.5 644.5 L 1072.5 644.5 L 1072.5 695.5 L 1051.5 695.5 Z M 637.5 644.5 L 659.5 644.5 L 659.5 695.5 L 637.5 695.5 Z M 1226.5 635.5 L 1248.5 635.5 L 1248.5 695.5 L 1226.5 695.5 Z M 1120.5 635.5 L 1141.5 635.5 L 1141.5 695.5 L 1120.5 695.5 Z M 318.5 635.5 L 339.5 635.5 L 339.5 695.5 L 318.5 695.5 Z M 1561.5 635.5 L 1582.5 635.5 L 1582.5 695.5 L 1561.5 695.5 Z M 1291.5 635.5 L 1313.5 635.5 L 1313.5 695.5 L 1291.5 695.5 Z M 808.5 635.5 L 829.5 635.5 L 829.5 695.5 L 808.5 695.5 Z M 756.5 635.5 L 778.5 635.5 L 778.5 695.5 L 756.5 695.5 Z M 501.5 635.5 L 522.5 635.5 L 522.5 695.5 L 501.5 695.5 Z M 258.5 635.5 L 279.5 635.5 L 279.5 695.5 L 258.5 695.5 Z M 902.5 604.5 L 924.5 604.5 L 924.5 695.5 L 902.5 695.5 Z M 1426.5 602.5 L 1448.5 602.5 L 1448.5 695.5 L 1426.5 695.5 Z M 1426.5 602.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1286.5 373.5 L 1308.5 373.5 L 1308.5 433.5 L 1286.5 433.5 Z M 1226.5 373.5 L 1248.5 373.5 L 1248.5 433.5 L 1226.5 433.5 Z M 1027.5 373.5 L 1049.5 373.5 L 1049.5 433.5 L 1027.5 433.5 Z M 509.5 373.5 L 531.5 373.5 L 531.5 433.5 L 509.5 433.5 Z M 575.5 373.5 L 596.5 373.5 L 596.5 433.5 L 575.5 433.5 Z M 815.5 373.5 L 837.5 373.5 L 837.5 433.5 L 815.5 433.5 Z M 746.5 373.5 L 768.5 373.5 L 768.5 433.5 L 746.5 433.5 Z M 1149.5 373.5 L 1171.5 373.5 L 1171.5 433.5 L 1149.5 433.5 Z M 646.5 373.5 L 667.5 373.5 L 667.5 433.5 L 646.5 433.5 Z M 1089.5 373.5 L 1110.5 373.5 L 1110.5 433.5 L 1089.5 433.5 Z M 1561.5 373.5 L 1582.5 373.5 L 1582.5 465.5 L 1561.5 465.5 Z M 258.5 377.5 L 279.5 377.5 L 279.5 469.5 L 258.5 469.5 Z M 318.5 377.5 L 339.5 377.5 L 339.5 469.5 L 318.5 469.5 Z M 956.5 373.5 L 978.5 373.5 L 978.5 493.5 L 956.5 493.5 Z M 1630.5 373.5 L 1652.5 373.5 L 1652.5 516.5 L 1630.5 516.5 Z M 1404.5 373.5 L 1425.5 373.5 L 1425.5 516.5 L 1404.5 516.5 Z M 1404.5 373.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 327.5 L 246.5 327.5 L 246.5 352.5 L 222.5 352.5 Z M 1671.5 327.5 L 1695.5 327.5 L 1695.5 352.5 L 1671.5 352.5 Z M 1605.5 327.5 L 1629.5 327.5 L 1629.5 352.5 L 1605.5 352.5 Z M 1539.5 327.5 L 1563.5 327.5 L 1563.5 352.5 L 1539.5 352.5 Z M 1473.5 327.5 L 1498.5 327.5 L 1498.5 352.5 L 1473.5 352.5 Z M 1407.5 327.5 L 1432.5 327.5 L 1432.5 352.5 L 1407.5 352.5 Z M 1342.5 327.5 L 1366.5 327.5 L 1366.5 352.5 L 1342.5 352.5 Z M 1276.5 327.5 L 1300.5 327.5 L 1300.5 352.5 L 1276.5 352.5 Z M 1210.5 327.5 L 1234.5 327.5 L 1234.5 352.5 L 1210.5 352.5 Z M 1144.5 327.5 L 1168.5 327.5 L 1168.5 352.5 L 1144.5 352.5 Z M 1078.5 327.5 L 1103.5 327.5 L 1103.5 352.5 L 1078.5 352.5 Z M 1012.5 327.5 L 1037.5 327.5 L 1037.5 352.5 L 1012.5 352.5 Z M 946.5 327.5 L 971.5 327.5 L 971.5 352.5 L 946.5 352.5 Z M 881.5 327.5 L 905.5 327.5 L 905.5 352.5 L 881.5 352.5 Z M 815.5 327.5 L 839.5 327.5 L 839.5 352.5 L 815.5 352.5 Z M 749.5 327.5 L 773.5 327.5 L 773.5 352.5 L 749.5 352.5 Z M 683.5 327.5 L 707.5 327.5 L 707.5 352.5 L 683.5 352.5 Z M 617.5 327.5 L 642.5 327.5 L 642.5 352.5 L 617.5 352.5 Z M 551.5 327.5 L 576.5 327.5 L 576.5 352.5 L 551.5 352.5 Z M 485.5 327.5 L 510.5 327.5 L 510.5 352.5 L 485.5 352.5 Z M 420.5 327.5 L 444.5 327.5 L 444.5 352.5 L 420.5 352.5 Z M 354.5 327.5 L 378.5 327.5 L 378.5 352.5 L 354.5 352.5 Z M 288.5 327.5 L 312.5 327.5 L 312.5 352.5 L 288.5 352.5 Z M 347.5 449.5 L 371.5 449.5 L 371.5 460.5 L 347.5 460.5 Z M 1064.5 449.5 L 1088.5 449.5 L 1088.5 468.5 L 1064.5 468.5 Z M 1064.5 468.5 L 1088.5 468.5 L 1088.5 473.5 L 1064.5 473.5 Z M 617.5 449.5 L 642.5 449.5 L 642.5 473.5 L 617.5 473.5 Z M 347.5 460.5 L 371.5 460.5 L 371.5 473.5 L 347.5 473.5 Z M 1218.5 550.5 L 1243.5 550.5 L 1243.5 556.5 L 1218.5 556.5 Z M 1064.5 546.5 L 1088.5 546.5 L 1088.5 558.5 L 1064.5 558.5 Z M 289.5 546.5 L 313.5 546.5 L 313.5 564.5 L 289.5 564.5 Z M 1064.5 558.5 L 1088.5 558.5 L 1088.5 571.5 L 1064.5 571.5 Z M 551.5 546.5 L 576.5 546.5 L 576.5 571.5 L 551.5 571.5 Z M 289.5 564.5 L 313.5 564.5 L 313.5 571.5 L 289.5 571.5 Z M 1218.5 556.5 L 1243.5 556.5 L 1243.5 574.5 L 1218.5 574.5 Z M 798.5 595.5 L 822.5 595.5 L 822.5 608.5 L 798.5 608.5 Z M 1261.5 595.5 L 1286.5 595.5 L 1286.5 619.5 L 1261.5 619.5 Z M 746.5 595.5 L 770.5 595.5 L 770.5 619.5 L 746.5 619.5 Z M 798.5 608.5 L 822.5 608.5 L 822.5 619.5 L 798.5 619.5 Z M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 1671.5 717.5 L 1695.5 717.5 L 1695.5 741.5 L 1671.5 741.5 Z M 1605.5 717.5 L 1629.5 717.5 L 1629.5 741.5 L 1605.5 741.5 Z M 1539.5 717.5 L 1563.5 717.5 L 1563.5 741.5 L 1539.5 741.5 Z M 1473.5 717.5 L 1498.5 717.5 L 1498.5 741.5 L 1473.5 741.5 Z M 1407.5 717.5 L 1432.5 717.5 L 1432.5 741.5 L 1407.5 741.5 Z M 1342.5 717.5 L 1366.5 717.5 L 1366.5 741.5 L 1342.5 741.5 Z M 1276.5 717.5 L 1300.5 717.5 L 1300.5 741.5 L 1276.5 741.5 Z M 1210.5 717.5 L 1234.5 717.5 L 1234.5 741.5 L 1210.5 741.5 Z M 1144.5 717.5 L 1168.5 717.5 L 1168.5 741.5 L 1144.5 741.5 Z M 1078.5 717.5 L 1103.5 717.5 L 1103.5 741.5 L 1078.5 741.5 Z M 1012.5 717.5 L 1037.5 717.5 L 1037.5 741.5 L 1012.5 741.5 Z M 946.5 717.5 L 971.5 717.5 L 971.5 741.5 L 946.5 741.5 Z M 881.5 717.5 L 905.5 717.5 L 905.5 741.5 L 881.5 741.5 Z M 815.5 717.5 L 839.5 717.5 L 839.5 741.5 L 815.5 741.5 Z M 749.5 717.5 L 773.5 717.5 L 773.5 741.5 L 749.5 741.5 Z M 683.5 717.5 L 707.5 717.5 L 707.5 741.5 L 683.5 741.5 Z M 617.5 717.5 L 642.5 717.5 L 642.5 741.5 L 617.5 741.5 Z M 551.5 717.5 L 576.5 717.5 L 576.5 741.5 L 551.5 741.5 Z M 485.5 717.5 L 510.5 717.5 L 510.5 741.5 L 485.5 741.5 Z M 420.5 717.5 L 444.5 717.5 L 444.5 741.5 L 420.5 741.5 Z M 354.5 717.5 L 378.5 717.5 L 378.5 741.5 L 354.5 741.5 Z M 288.5 717.5 L 312.5 717.5 L 312.5 741.5 L 288.5 741.5 Z M 288.5 717.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image370"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 222 362 L 246 362 M 222 338 L 246 338 M 222 338 L 222 362 M 246 338 L 246 362 " 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 222 362 L 246 362 M 222 338 L 246 338 M 246 362 L 246 338 M 222 362 L 222 338 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 201 347 L 201 352 M 198 350 L 203 350 " 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 345 L 201 354 M 196 350 L 205 350 M 200 351 L 202 351 M 200 349 L 202 349 M 200 349 L 200 351 M 202 349 L 202 351 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.svg b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.svg
index 6f709d5..0a7ec79 100644
--- a/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.svg
+++ b/cells/dfrbp/sky130_fd_sc_hd__dfrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <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="#image369"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1621.5 599.5 L 1642.5 599.5 L 1642.5 689.5 L 1621.5 689.5 Z M 619.5 639.5 L 639.5 639.5 L 639.5 689.5 L 619.5 689.5 Z M 553.5 639.5 L 574.5 639.5 L 574.5 689.5 L 553.5 689.5 Z M 1016.5 639.5 L 1037.5 639.5 L 1037.5 689.5 L 1016.5 689.5 Z M 941.5 639.5 L 962.5 639.5 L 962.5 689.5 L 941.5 689.5 Z M 1376.5 631.5 L 1397.5 631.5 L 1397.5 689.5 L 1376.5 689.5 Z M 1247.5 631.5 L 1267.5 631.5 L 1267.5 689.5 L 1247.5 689.5 Z M 1184.5 631.5 L 1205.5 631.5 L 1205.5 689.5 L 1184.5 689.5 Z M 1082.5 631.5 L 1103.5 631.5 L 1103.5 689.5 L 1082.5 689.5 Z M 488.5 631.5 L 508.5 631.5 L 508.5 689.5 L 488.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 782.5 631.5 L 803.5 631.5 L 803.5 689.5 L 782.5 689.5 Z M 733.5 631.5 L 754.5 631.5 L 754.5 689.5 L 733.5 689.5 Z M 873.5 601.5 L 894.5 601.5 L 894.5 689.5 L 873.5 689.5 Z M 1564.5 599.5 L 1584.5 599.5 L 1584.5 689.5 L 1564.5 689.5 Z M 1506.5 599.5 L 1526.5 599.5 L 1526.5 689.5 L 1506.5 689.5 Z M 1443.5 599.5 L 1463.5 599.5 L 1463.5 689.5 L 1443.5 689.5 Z M 1443.5 599.5 "/>
 </clipPath>
-<image id="image341" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1242.5 379.5 L 1263.5 379.5 L 1263.5 437.5 L 1242.5 437.5 Z M 1052.5 379.5 L 1073.5 379.5 L 1073.5 437.5 L 1052.5 437.5 Z M 993.5 379.5 L 1014.5 379.5 L 1014.5 437.5 L 993.5 437.5 Z M 790.5 379.5 L 811.5 379.5 L 811.5 437.5 L 790.5 437.5 Z M 496.5 379.5 L 516.5 379.5 L 516.5 437.5 L 496.5 437.5 Z M 559.5 379.5 L 580.5 379.5 L 580.5 437.5 L 559.5 437.5 Z M 627.5 379.5 L 648.5 379.5 L 648.5 437.5 L 627.5 437.5 Z M 1184.5 379.5 L 1205.5 379.5 L 1205.5 437.5 L 1184.5 437.5 Z M 723.5 379.5 L 744.5 379.5 L 744.5 437.5 L 723.5 437.5 Z M 1110.5 379.5 L 1131.5 379.5 L 1131.5 437.5 L 1110.5 437.5 Z M 312.5 384.5 L 333.5 384.5 L 333.5 472.5 L 312.5 472.5 Z M 255.5 384.5 L 275.5 384.5 L 275.5 472.5 L 255.5 472.5 Z M 1376.5 385.5 L 1397.5 385.5 L 1397.5 473.5 L 1376.5 473.5 Z M 925.5 379.5 L 946.5 379.5 L 946.5 495.5 L 925.5 495.5 Z M 1621.5 379.5 L 1642.5 379.5 L 1642.5 517.5 L 1621.5 517.5 Z M 1443.5 379.5 L 1463.5 379.5 L 1463.5 517.5 L 1443.5 517.5 Z M 1564.5 379.5 L 1584.5 379.5 L 1584.5 517.5 L 1564.5 517.5 Z M 1506.5 379.5 L 1526.5 379.5 L 1526.5 517.5 L 1506.5 517.5 Z M 1506.5 379.5 "/>
 </clipPath>
-<image id="image342" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 340.5 452.5 L 363.5 452.5 L 363.5 463.5 L 340.5 463.5 Z M 1028.5 452.5 L 1052.5 452.5 L 1052.5 470.5 L 1028.5 470.5 Z M 1028.5 470.5 L 1052.5 470.5 L 1052.5 476.5 L 1028.5 476.5 Z M 600.5 452.5 L 623.5 452.5 L 623.5 476.5 L 600.5 476.5 Z M 340.5 463.5 L 363.5 463.5 L 363.5 476.5 L 340.5 476.5 Z M 1177.5 549.5 L 1200.5 549.5 L 1200.5 555.5 L 1177.5 555.5 Z M 1028.5 546.5 L 1052.5 546.5 L 1052.5 557.5 L 1028.5 557.5 Z M 284.5 546.5 L 308.5 546.5 L 308.5 563.5 L 284.5 563.5 Z M 1028.5 557.5 L 1052.5 557.5 L 1052.5 569.5 L 1028.5 569.5 Z M 536.5 546.5 L 560.5 546.5 L 560.5 569.5 L 536.5 569.5 Z M 284.5 563.5 L 308.5 563.5 L 308.5 569.5 L 284.5 569.5 Z M 1177.5 555.5 L 1200.5 555.5 L 1200.5 573.5 L 1177.5 573.5 Z M 773.5 592.5 L 796.5 592.5 L 796.5 605.5 L 773.5 605.5 Z M 1218.5 592.5 L 1241.5 592.5 L 1241.5 616.5 L 1218.5 616.5 Z M 723.5 592.5 L 747.5 592.5 L 747.5 616.5 L 723.5 616.5 Z M 773.5 605.5 L 796.5 605.5 L 796.5 616.5 L 773.5 616.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image343" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 220 370 L 244 370 M 220 346 L 244 346 M 220 346 L 220 370 M 244 346 L 244 370 " 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 220 370 L 244 370 M 220 346 L 244 346 M 244 370 L 244 346 M 220 370 L 220 346 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.svg b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.svg
index 096083d..3f7078c 100644
--- a/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.svg
+++ b/cells/dfrtn/sky130_fd_sc_hd__dfrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image336" 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="#image336"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 229.5 743.5 "/>
 </clipPath>
 <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="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1624.5 612.5 L 1648.5 612.5 L 1648.5 719.5 L 1624.5 719.5 Z M 1178.5 660.5 L 1202.5 660.5 L 1202.5 719.5 L 1178.5 719.5 Z M 704.5 660.5 L 729.5 660.5 L 729.5 719.5 L 704.5 719.5 Z M 626.5 660.5 L 650.5 660.5 L 650.5 719.5 L 626.5 719.5 Z M 1089.5 660.5 L 1113.5 660.5 L 1113.5 719.5 L 1089.5 719.5 Z M 548.5 650.5 L 572.5 650.5 L 572.5 719.5 L 548.5 719.5 Z M 1257.5 650.5 L 1281.5 650.5 L 1281.5 719.5 L 1257.5 719.5 Z M 339.5 650.5 L 364.5 650.5 L 364.5 719.5 L 339.5 719.5 Z M 899.5 650.5 L 924.5 650.5 L 924.5 719.5 L 899.5 719.5 Z M 840.5 650.5 L 865.5 650.5 L 865.5 719.5 L 840.5 719.5 Z M 1453.5 650.5 L 1478.5 650.5 L 1478.5 719.5 L 1453.5 719.5 Z M 1379.5 650.5 L 1403.5 650.5 L 1403.5 719.5 L 1379.5 719.5 Z M 270.5 650.5 L 295.5 650.5 L 295.5 719.5 L 270.5 719.5 Z M 1007.5 614.5 L 1032.5 614.5 L 1032.5 719.5 L 1007.5 719.5 Z M 1007.5 614.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1447.5 350.5 L 1472.5 350.5 L 1472.5 419.5 L 1447.5 419.5 Z M 1290.5 350.5 L 1315.5 350.5 L 1315.5 419.5 L 1290.5 419.5 Z M 908.5 350.5 L 933.5 350.5 L 933.5 419.5 L 908.5 419.5 Z M 558.5 350.5 L 582.5 350.5 L 582.5 419.5 L 558.5 419.5 Z M 633.5 350.5 L 658.5 350.5 L 658.5 419.5 L 633.5 419.5 Z M 714.5 350.5 L 739.5 350.5 L 739.5 419.5 L 714.5 419.5 Z M 829.5 350.5 L 853.5 350.5 L 853.5 419.5 L 829.5 419.5 Z M 1221.5 350.5 L 1246.5 350.5 L 1246.5 419.5 L 1221.5 419.5 Z M 1379.5 350.5 L 1403.5 350.5 L 1403.5 419.5 L 1379.5 419.5 Z M 1151.5 350.5 L 1175.5 350.5 L 1175.5 419.5 L 1151.5 419.5 Z M 339.5 355.5 L 364.5 355.5 L 364.5 460.5 L 339.5 460.5 Z M 270.5 355.5 L 295.5 355.5 L 295.5 460.5 L 270.5 460.5 Z M 1070.5 350.5 L 1094.5 350.5 L 1094.5 488.5 L 1070.5 488.5 Z M 1624.5 350.5 L 1648.5 350.5 L 1648.5 514.5 L 1624.5 514.5 Z M 1624.5 350.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 1193.5 437.5 L 1220.5 437.5 L 1220.5 458.5 L 1193.5 458.5 Z M 1193.5 458.5 L 1220.5 458.5 L 1220.5 465.5 L 1193.5 465.5 Z M 681.5 437.5 L 709.5 437.5 L 709.5 465.5 L 681.5 465.5 Z M 313.5 437.5 L 341.5 437.5 L 341.5 465.5 L 313.5 465.5 Z M 1370.5 552.5 L 1397.5 552.5 L 1397.5 560.5 L 1370.5 560.5 Z M 1193.5 548.5 L 1220.5 548.5 L 1220.5 561.5 L 1193.5 561.5 Z M 1193.5 561.5 L 1220.5 561.5 L 1220.5 576.5 L 1193.5 576.5 Z M 606.5 548.5 L 634.5 548.5 L 634.5 576.5 L 606.5 576.5 Z M 372.5 548.5 L 400.5 548.5 L 400.5 576.5 L 372.5 576.5 Z M 1370.5 560.5 L 1397.5 560.5 L 1397.5 580.5 L 1370.5 580.5 Z M 888.5 604.5 L 916.5 604.5 L 916.5 619.5 L 888.5 619.5 Z M 1419.5 604.5 L 1447.5 604.5 L 1447.5 632.5 L 1419.5 632.5 Z M 829.5 604.5 L 857.5 604.5 L 857.5 632.5 L 829.5 632.5 Z M 888.5 619.5 L 916.5 619.5 L 916.5 632.5 L 888.5 632.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,5 @@
 <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 229 336 L 257 336 M 229 308 L 257 308 M 229 308 L 229 336 M 257 308 L 257 336 " 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 229 336 L 257 336 M 229 308 L 257 308 M 257 336 L 257 308 M 229 336 L 229 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.svg b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.svg
index bfee721..50a54bf 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.svg
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 229.5 743.5 "/>
 </clipPath>
 <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="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1624.5 612.5 L 1648.5 612.5 L 1648.5 719.5 L 1624.5 719.5 Z M 1178.5 660.5 L 1202.5 660.5 L 1202.5 719.5 L 1178.5 719.5 Z M 704.5 660.5 L 729.5 660.5 L 729.5 719.5 L 704.5 719.5 Z M 626.5 660.5 L 650.5 660.5 L 650.5 719.5 L 626.5 719.5 Z M 1089.5 660.5 L 1113.5 660.5 L 1113.5 719.5 L 1089.5 719.5 Z M 548.5 650.5 L 572.5 650.5 L 572.5 719.5 L 548.5 719.5 Z M 1257.5 650.5 L 1281.5 650.5 L 1281.5 719.5 L 1257.5 719.5 Z M 339.5 650.5 L 364.5 650.5 L 364.5 719.5 L 339.5 719.5 Z M 899.5 650.5 L 924.5 650.5 L 924.5 719.5 L 899.5 719.5 Z M 840.5 650.5 L 865.5 650.5 L 865.5 719.5 L 840.5 719.5 Z M 1453.5 650.5 L 1478.5 650.5 L 1478.5 719.5 L 1453.5 719.5 Z M 1379.5 650.5 L 1403.5 650.5 L 1403.5 719.5 L 1379.5 719.5 Z M 270.5 650.5 L 295.5 650.5 L 295.5 719.5 L 270.5 719.5 Z M 1007.5 614.5 L 1032.5 614.5 L 1032.5 719.5 L 1007.5 719.5 Z M 1007.5 614.5 "/>
 </clipPath>
-<image id="image340" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1447.5 350.5 L 1472.5 350.5 L 1472.5 419.5 L 1447.5 419.5 Z M 1290.5 350.5 L 1315.5 350.5 L 1315.5 419.5 L 1290.5 419.5 Z M 908.5 350.5 L 933.5 350.5 L 933.5 419.5 L 908.5 419.5 Z M 558.5 350.5 L 582.5 350.5 L 582.5 419.5 L 558.5 419.5 Z M 633.5 350.5 L 658.5 350.5 L 658.5 419.5 L 633.5 419.5 Z M 714.5 350.5 L 739.5 350.5 L 739.5 419.5 L 714.5 419.5 Z M 829.5 350.5 L 853.5 350.5 L 853.5 419.5 L 829.5 419.5 Z M 1221.5 350.5 L 1246.5 350.5 L 1246.5 419.5 L 1221.5 419.5 Z M 1379.5 350.5 L 1403.5 350.5 L 1403.5 419.5 L 1379.5 419.5 Z M 1151.5 350.5 L 1175.5 350.5 L 1175.5 419.5 L 1151.5 419.5 Z M 339.5 355.5 L 364.5 355.5 L 364.5 460.5 L 339.5 460.5 Z M 270.5 355.5 L 295.5 355.5 L 295.5 460.5 L 270.5 460.5 Z M 1070.5 350.5 L 1094.5 350.5 L 1094.5 488.5 L 1070.5 488.5 Z M 1624.5 350.5 L 1648.5 350.5 L 1648.5 514.5 L 1624.5 514.5 Z M 1624.5 350.5 "/>
 </clipPath>
-<image id="image341" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 372.5 437.5 L 400.5 437.5 L 400.5 450.5 L 372.5 450.5 Z M 1193.5 437.5 L 1220.5 437.5 L 1220.5 458.5 L 1193.5 458.5 Z M 1193.5 458.5 L 1220.5 458.5 L 1220.5 465.5 L 1193.5 465.5 Z M 681.5 437.5 L 709.5 437.5 L 709.5 465.5 L 681.5 465.5 Z M 372.5 450.5 L 400.5 450.5 L 400.5 465.5 L 372.5 465.5 Z M 1370.5 552.5 L 1397.5 552.5 L 1397.5 560.5 L 1370.5 560.5 Z M 1193.5 548.5 L 1220.5 548.5 L 1220.5 561.5 L 1193.5 561.5 Z M 305.5 548.5 L 333.5 548.5 L 333.5 569.5 L 305.5 569.5 Z M 1193.5 561.5 L 1220.5 561.5 L 1220.5 576.5 L 1193.5 576.5 Z M 606.5 548.5 L 634.5 548.5 L 634.5 576.5 L 606.5 576.5 Z M 305.5 569.5 L 333.5 569.5 L 333.5 576.5 L 305.5 576.5 Z M 1370.5 560.5 L 1397.5 560.5 L 1397.5 580.5 L 1370.5 580.5 Z M 888.5 604.5 L 916.5 604.5 L 916.5 619.5 L 888.5 619.5 Z M 1419.5 604.5 L 1447.5 604.5 L 1447.5 632.5 L 1419.5 632.5 Z M 829.5 604.5 L 857.5 604.5 L 857.5 632.5 L 829.5 632.5 Z M 888.5 619.5 L 916.5 619.5 L 916.5 632.5 L 888.5 632.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image342" 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="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;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface363">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 229 336 L 257 336 M 229 308 L 257 308 M 229 308 L 229 336 M 257 308 L 257 336 " 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 229 336 L 257 336 M 229 308 L 257 308 M 257 336 L 257 308 M 229 336 L 229 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.svg b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.svg
index ee44ffe..49b6f14 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.svg
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image368" 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="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <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="#image368"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1622.5 609.5 L 1646.5 609.5 L 1646.5 710.5 L 1622.5 710.5 Z M 605.5 654.5 L 628.5 654.5 L 628.5 710.5 L 605.5 710.5 Z M 1131.5 654.5 L 1155.5 654.5 L 1155.5 710.5 L 1131.5 710.5 Z M 680.5 654.5 L 703.5 654.5 L 703.5 710.5 L 680.5 710.5 Z M 1046.5 654.5 L 1070.5 654.5 L 1070.5 710.5 L 1046.5 710.5 Z M 1207.5 645.5 L 1230.5 645.5 L 1230.5 710.5 L 1207.5 710.5 Z M 530.5 645.5 L 554.5 645.5 L 554.5 710.5 L 530.5 710.5 Z M 1323.5 645.5 L 1346.5 645.5 L 1346.5 710.5 L 1323.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 866.5 645.5 L 889.5 645.5 L 889.5 710.5 L 866.5 710.5 Z M 809.5 645.5 L 833.5 645.5 L 833.5 710.5 L 809.5 710.5 Z M 1394.5 645.5 L 1418.5 645.5 L 1418.5 710.5 L 1394.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 969.5 610.5 L 992.5 610.5 L 992.5 710.5 L 969.5 710.5 Z M 1557.5 609.5 L 1580.5 609.5 L 1580.5 710.5 L 1557.5 710.5 Z M 1557.5 609.5 "/>
 </clipPath>
-<image id="image341" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1389.5 358.5 L 1412.5 358.5 L 1412.5 424.5 L 1389.5 424.5 Z M 1323.5 358.5 L 1346.5 358.5 L 1346.5 424.5 L 1323.5 424.5 Z M 874.5 358.5 L 898.5 358.5 L 898.5 424.5 L 874.5 424.5 Z M 540.5 358.5 L 563.5 358.5 L 563.5 424.5 L 540.5 424.5 Z M 1239.5 358.5 L 1262.5 358.5 L 1262.5 424.5 L 1239.5 424.5 Z M 798.5 358.5 L 822.5 358.5 L 822.5 424.5 L 798.5 424.5 Z M 689.5 358.5 L 712.5 358.5 L 712.5 424.5 L 689.5 424.5 Z M 1173.5 358.5 L 1196.5 358.5 L 1196.5 424.5 L 1173.5 424.5 Z M 612.5 358.5 L 635.5 358.5 L 635.5 424.5 L 612.5 424.5 Z M 1106.5 358.5 L 1129.5 358.5 L 1129.5 424.5 L 1106.5 424.5 Z M 265.5 363.5 L 289.5 363.5 L 289.5 463.5 L 265.5 463.5 Z M 331.5 363.5 L 354.5 363.5 L 354.5 463.5 L 331.5 463.5 Z M 1028.5 358.5 L 1052.5 358.5 L 1052.5 490.5 L 1028.5 490.5 Z M 1557.5 358.5 L 1580.5 358.5 L 1580.5 515.5 L 1557.5 515.5 Z M 1622.5 358.5 L 1646.5 358.5 L 1646.5 515.5 L 1622.5 515.5 Z M 1622.5 358.5 "/>
 </clipPath>
-<image id="image342" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 362.5 441.5 L 389.5 441.5 L 389.5 454.5 L 362.5 454.5 Z M 1146.5 441.5 L 1172.5 441.5 L 1172.5 462.5 L 1146.5 462.5 Z M 1146.5 462.5 L 1172.5 462.5 L 1172.5 468.5 L 1146.5 468.5 Z M 658.5 441.5 L 684.5 441.5 L 684.5 468.5 L 658.5 468.5 Z M 362.5 454.5 L 389.5 454.5 L 389.5 468.5 L 362.5 468.5 Z M 1314.5 552.5 L 1341.5 552.5 L 1341.5 559.5 L 1314.5 559.5 Z M 1146.5 548.5 L 1172.5 548.5 L 1172.5 560.5 L 1146.5 560.5 Z M 299.5 548.5 L 325.5 548.5 L 325.5 567.5 L 299.5 567.5 Z M 1146.5 560.5 L 1172.5 560.5 L 1172.5 574.5 L 1146.5 574.5 Z M 586.5 548.5 L 612.5 548.5 L 612.5 574.5 L 586.5 574.5 Z M 299.5 567.5 L 325.5 567.5 L 325.5 574.5 L 299.5 574.5 Z M 1314.5 559.5 L 1341.5 559.5 L 1341.5 578.5 L 1314.5 578.5 Z M 855.5 601.5 L 881.5 601.5 L 881.5 615.5 L 855.5 615.5 Z M 1361.5 601.5 L 1388.5 601.5 L 1388.5 627.5 L 1361.5 627.5 Z M 798.5 601.5 L 825.5 601.5 L 825.5 627.5 L 798.5 627.5 Z M 855.5 615.5 L 881.5 615.5 L 881.5 627.5 L 855.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image343" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface365">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 226 345 L 253 345 M 226 319 L 253 319 M 226 319 L 226 345 M 253 319 L 253 345 " 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 226 345 L 253 345 M 226 319 L 253 319 M 253 345 L 253 319 M 226 345 L 226 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.svg b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.svg
index c87e863..c3d37b4 100644
--- a/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.svg
+++ b/cells/dfrtp/sky130_fd_sc_hd__dfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 312.5 L 1743.5 312.5 L 1743.5 542.5 L 174.5 542.5 Z M 174.5 312.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 222.5 717.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1426.5 602.5 L 1448.5 602.5 L 1448.5 695.5 L 1426.5 695.5 Z M 569.5 644.5 L 590.5 644.5 L 590.5 695.5 L 569.5 695.5 Z M 637.5 644.5 L 659.5 644.5 L 659.5 695.5 L 637.5 695.5 Z M 973.5 644.5 L 994.5 644.5 L 994.5 695.5 L 973.5 695.5 Z M 1051.5 644.5 L 1072.5 644.5 L 1072.5 695.5 L 1051.5 695.5 Z M 1291.5 635.5 L 1313.5 635.5 L 1313.5 695.5 L 1291.5 695.5 Z M 1226.5 635.5 L 1248.5 635.5 L 1248.5 695.5 L 1226.5 695.5 Z M 1120.5 635.5 L 1141.5 635.5 L 1141.5 695.5 L 1120.5 695.5 Z M 258.5 635.5 L 279.5 635.5 L 279.5 695.5 L 258.5 695.5 Z M 318.5 635.5 L 339.5 635.5 L 339.5 695.5 L 318.5 695.5 Z M 501.5 635.5 L 522.5 635.5 L 522.5 695.5 L 501.5 695.5 Z M 808.5 635.5 L 829.5 635.5 L 829.5 695.5 L 808.5 695.5 Z M 756.5 635.5 L 778.5 635.5 L 778.5 695.5 L 756.5 695.5 Z M 902.5 604.5 L 924.5 604.5 L 924.5 695.5 L 902.5 695.5 Z M 1606.5 602.5 L 1628.5 602.5 L 1628.5 695.5 L 1606.5 695.5 Z M 1546.5 602.5 L 1568.5 602.5 L 1568.5 695.5 L 1546.5 695.5 Z M 1486.5 602.5 L 1508.5 602.5 L 1508.5 695.5 L 1486.5 695.5 Z M 1486.5 602.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1286.5 373.5 L 1308.5 373.5 L 1308.5 433.5 L 1286.5 433.5 Z M 1089.5 373.5 L 1110.5 373.5 L 1110.5 433.5 L 1089.5 433.5 Z M 1027.5 373.5 L 1049.5 373.5 L 1049.5 433.5 L 1027.5 433.5 Z M 509.5 373.5 L 531.5 373.5 L 531.5 433.5 L 509.5 433.5 Z M 575.5 373.5 L 596.5 373.5 L 596.5 433.5 L 575.5 433.5 Z M 646.5 373.5 L 667.5 373.5 L 667.5 433.5 L 646.5 433.5 Z M 815.5 373.5 L 837.5 373.5 L 837.5 433.5 L 815.5 433.5 Z M 1226.5 373.5 L 1248.5 373.5 L 1248.5 433.5 L 1226.5 433.5 Z M 746.5 373.5 L 768.5 373.5 L 768.5 433.5 L 746.5 433.5 Z M 1149.5 373.5 L 1171.5 373.5 L 1171.5 433.5 L 1149.5 433.5 Z M 258.5 377.5 L 279.5 377.5 L 279.5 469.5 L 258.5 469.5 Z M 318.5 377.5 L 339.5 377.5 L 339.5 469.5 L 318.5 469.5 Z M 956.5 373.5 L 978.5 373.5 L 978.5 493.5 L 956.5 493.5 Z M 1546.5 373.5 L 1568.5 373.5 L 1568.5 516.5 L 1546.5 516.5 Z M 1486.5 373.5 L 1508.5 373.5 L 1508.5 516.5 L 1486.5 516.5 Z M 1606.5 373.5 L 1628.5 373.5 L 1628.5 516.5 L 1606.5 516.5 Z M 1426.5 373.5 L 1448.5 373.5 L 1448.5 516.5 L 1426.5 516.5 Z M 1426.5 373.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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 327.5 L 246.5 327.5 L 246.5 352.5 L 222.5 352.5 Z M 1671.5 327.5 L 1695.5 327.5 L 1695.5 352.5 L 1671.5 352.5 Z M 1605.5 327.5 L 1629.5 327.5 L 1629.5 352.5 L 1605.5 352.5 Z M 1539.5 327.5 L 1563.5 327.5 L 1563.5 352.5 L 1539.5 352.5 Z M 1473.5 327.5 L 1498.5 327.5 L 1498.5 352.5 L 1473.5 352.5 Z M 1407.5 327.5 L 1432.5 327.5 L 1432.5 352.5 L 1407.5 352.5 Z M 1342.5 327.5 L 1366.5 327.5 L 1366.5 352.5 L 1342.5 352.5 Z M 1276.5 327.5 L 1300.5 327.5 L 1300.5 352.5 L 1276.5 352.5 Z M 1210.5 327.5 L 1234.5 327.5 L 1234.5 352.5 L 1210.5 352.5 Z M 1144.5 327.5 L 1168.5 327.5 L 1168.5 352.5 L 1144.5 352.5 Z M 1078.5 327.5 L 1103.5 327.5 L 1103.5 352.5 L 1078.5 352.5 Z M 1012.5 327.5 L 1037.5 327.5 L 1037.5 352.5 L 1012.5 352.5 Z M 946.5 327.5 L 971.5 327.5 L 971.5 352.5 L 946.5 352.5 Z M 881.5 327.5 L 905.5 327.5 L 905.5 352.5 L 881.5 352.5 Z M 815.5 327.5 L 839.5 327.5 L 839.5 352.5 L 815.5 352.5 Z M 749.5 327.5 L 773.5 327.5 L 773.5 352.5 L 749.5 352.5 Z M 683.5 327.5 L 707.5 327.5 L 707.5 352.5 L 683.5 352.5 Z M 617.5 327.5 L 642.5 327.5 L 642.5 352.5 L 617.5 352.5 Z M 551.5 327.5 L 576.5 327.5 L 576.5 352.5 L 551.5 352.5 Z M 485.5 327.5 L 510.5 327.5 L 510.5 352.5 L 485.5 352.5 Z M 420.5 327.5 L 444.5 327.5 L 444.5 352.5 L 420.5 352.5 Z M 354.5 327.5 L 378.5 327.5 L 378.5 352.5 L 354.5 352.5 Z M 288.5 327.5 L 312.5 327.5 L 312.5 352.5 L 288.5 352.5 Z M 347.5 449.5 L 371.5 449.5 L 371.5 460.5 L 347.5 460.5 Z M 1064.5 449.5 L 1088.5 449.5 L 1088.5 468.5 L 1064.5 468.5 Z M 1064.5 468.5 L 1088.5 468.5 L 1088.5 473.5 L 1064.5 473.5 Z M 617.5 449.5 L 642.5 449.5 L 642.5 473.5 L 617.5 473.5 Z M 347.5 460.5 L 371.5 460.5 L 371.5 473.5 L 347.5 473.5 Z M 1218.5 550.5 L 1243.5 550.5 L 1243.5 556.5 L 1218.5 556.5 Z M 1064.5 546.5 L 1088.5 546.5 L 1088.5 558.5 L 1064.5 558.5 Z M 289.5 546.5 L 313.5 546.5 L 313.5 564.5 L 289.5 564.5 Z M 1064.5 558.5 L 1088.5 558.5 L 1088.5 571.5 L 1064.5 571.5 Z M 551.5 546.5 L 576.5 546.5 L 576.5 571.5 L 551.5 571.5 Z M 289.5 564.5 L 313.5 564.5 L 313.5 571.5 L 289.5 571.5 Z M 1218.5 556.5 L 1243.5 556.5 L 1243.5 574.5 L 1218.5 574.5 Z M 798.5 595.5 L 822.5 595.5 L 822.5 608.5 L 798.5 608.5 Z M 1261.5 595.5 L 1286.5 595.5 L 1286.5 619.5 L 1261.5 619.5 Z M 746.5 595.5 L 770.5 595.5 L 770.5 619.5 L 746.5 619.5 Z M 798.5 608.5 L 822.5 608.5 L 822.5 619.5 L 798.5 619.5 Z M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 1671.5 717.5 L 1695.5 717.5 L 1695.5 741.5 L 1671.5 741.5 Z M 1605.5 717.5 L 1629.5 717.5 L 1629.5 741.5 L 1605.5 741.5 Z M 1539.5 717.5 L 1563.5 717.5 L 1563.5 741.5 L 1539.5 741.5 Z M 1473.5 717.5 L 1498.5 717.5 L 1498.5 741.5 L 1473.5 741.5 Z M 1407.5 717.5 L 1432.5 717.5 L 1432.5 741.5 L 1407.5 741.5 Z M 1342.5 717.5 L 1366.5 717.5 L 1366.5 741.5 L 1342.5 741.5 Z M 1276.5 717.5 L 1300.5 717.5 L 1300.5 741.5 L 1276.5 741.5 Z M 1210.5 717.5 L 1234.5 717.5 L 1234.5 741.5 L 1210.5 741.5 Z M 1144.5 717.5 L 1168.5 717.5 L 1168.5 741.5 L 1144.5 741.5 Z M 1078.5 717.5 L 1103.5 717.5 L 1103.5 741.5 L 1078.5 741.5 Z M 1012.5 717.5 L 1037.5 717.5 L 1037.5 741.5 L 1012.5 741.5 Z M 946.5 717.5 L 971.5 717.5 L 971.5 741.5 L 946.5 741.5 Z M 881.5 717.5 L 905.5 717.5 L 905.5 741.5 L 881.5 741.5 Z M 815.5 717.5 L 839.5 717.5 L 839.5 741.5 L 815.5 741.5 Z M 749.5 717.5 L 773.5 717.5 L 773.5 741.5 L 749.5 741.5 Z M 683.5 717.5 L 707.5 717.5 L 707.5 741.5 L 683.5 741.5 Z M 617.5 717.5 L 642.5 717.5 L 642.5 741.5 L 617.5 741.5 Z M 551.5 717.5 L 576.5 717.5 L 576.5 741.5 L 551.5 741.5 Z M 485.5 717.5 L 510.5 717.5 L 510.5 741.5 L 485.5 741.5 Z M 420.5 717.5 L 444.5 717.5 L 444.5 741.5 L 420.5 741.5 Z M 354.5 717.5 L 378.5 717.5 L 378.5 741.5 L 354.5 741.5 Z M 288.5 717.5 L 312.5 717.5 L 312.5 741.5 L 288.5 741.5 Z M 288.5 717.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface331">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <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 222 362 L 246 362 M 222 338 L 246 338 M 222 338 L 222 362 M 246 338 L 246 362 " 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 222 362 L 246 362 M 222 338 L 246 338 M 246 362 L 246 338 M 222 362 L 222 338 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1663 484 L 1687 484 M 1663 460 L 1687 460 M 1663 460 L 1663 484 M 1687 460 L 1687 484 M 201 347 L 201 352 M 198 350 L 203 350 " 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 345 L 201 354 M 196 350 L 205 350 M 200 351 L 202 351 M 200 349 L 202 349 M 200 349 L 200 351 M 202 349 L 202 351 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.svg b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.svg
index bfcfe01..154cc5c 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.svg
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 312.5 L 1743.5 312.5 L 1743.5 542.5 L 174.5 542.5 Z M 174.5 312.5 "/>
 </clipPath>
-<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image476" 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="#image449"/>
+  <use xlink:href="#image476"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 222.5 717.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image449"/>
+  <use xlink:href="#image476"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1585.5 602.5 L 1606.5 602.5 L 1606.5 695.5 L 1585.5 695.5 Z M 521.5 644.5 L 542.5 644.5 L 542.5 695.5 L 521.5 695.5 Z M 599.5 644.5 L 621.5 644.5 L 621.5 695.5 L 599.5 695.5 Z M 318.5 635.5 L 339.5 635.5 L 339.5 695.5 L 318.5 695.5 Z M 258.5 635.5 L 279.5 635.5 L 279.5 695.5 L 258.5 695.5 Z M 1159.5 635.5 L 1181.5 635.5 L 1181.5 695.5 L 1159.5 695.5 Z M 1108.5 635.5 L 1129.5 635.5 L 1129.5 695.5 L 1108.5 695.5 Z M 1056.5 635.5 L 1077.5 635.5 L 1077.5 695.5 L 1056.5 695.5 Z M 987.5 635.5 L 1009.5 635.5 L 1009.5 695.5 L 987.5 695.5 Z M 936.5 635.5 L 957.5 635.5 L 957.5 695.5 L 936.5 695.5 Z M 801.5 635.5 L 823.5 635.5 L 823.5 695.5 L 801.5 695.5 Z M 750.5 635.5 L 771.5 635.5 L 771.5 695.5 L 750.5 695.5 Z M 668.5 635.5 L 689.5 635.5 L 689.5 695.5 L 668.5 695.5 Z M 1517.5 635.5 L 1538.5 635.5 L 1538.5 695.5 L 1517.5 695.5 Z M 1248.5 618.5 L 1269.5 618.5 L 1269.5 695.5 L 1248.5 695.5 Z M 453.5 604.5 L 474.5 604.5 L 474.5 695.5 L 453.5 695.5 Z M 1382.5 602.5 L 1404.5 602.5 L 1404.5 695.5 L 1382.5 695.5 Z M 1382.5 602.5 "/>
 </clipPath>
-<image id="image450" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image477" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image450"/>
+  <use xlink:href="#image477"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1179.5 373.5 L 1201.5 373.5 L 1201.5 433.5 L 1179.5 433.5 Z M 916.5 373.5 L 937.5 373.5 L 937.5 433.5 L 916.5 433.5 Z M 864.5 373.5 L 886.5 373.5 L 886.5 433.5 L 864.5 433.5 Z M 804.5 373.5 L 825.5 373.5 L 825.5 433.5 L 804.5 433.5 Z M 522.5 373.5 L 543.5 373.5 L 543.5 433.5 L 522.5 433.5 Z M 582.5 373.5 L 604.5 373.5 L 604.5 433.5 L 582.5 433.5 Z M 744.5 373.5 L 765.5 373.5 L 765.5 433.5 L 744.5 433.5 Z M 1045.5 373.5 L 1066.5 373.5 L 1066.5 433.5 L 1045.5 433.5 Z M 668.5 373.5 L 689.5 373.5 L 689.5 433.5 L 668.5 433.5 Z M 993.5 373.5 L 1014.5 373.5 L 1014.5 433.5 L 993.5 433.5 Z M 1517.5 373.5 L 1538.5 373.5 L 1538.5 465.5 L 1517.5 465.5 Z M 318.5 377.5 L 339.5 377.5 L 339.5 469.5 L 318.5 469.5 Z M 258.5 377.5 L 279.5 377.5 L 279.5 469.5 L 258.5 469.5 Z M 453.5 373.5 L 474.5 373.5 L 474.5 493.5 L 453.5 493.5 Z M 1248.5 373.5 L 1269.5 373.5 L 1269.5 493.5 L 1248.5 493.5 Z M 1585.5 373.5 L 1606.5 373.5 L 1606.5 516.5 L 1585.5 516.5 Z M 1382.5 373.5 L 1404.5 373.5 L 1404.5 516.5 L 1382.5 516.5 Z M 1382.5 373.5 "/>
 </clipPath>
-<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image478" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image451"/>
+  <use xlink:href="#image478"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 327.5 L 246.5 327.5 L 246.5 352.5 L 222.5 352.5 Z M 1671.5 327.5 L 1695.5 327.5 L 1695.5 352.5 L 1671.5 352.5 Z M 1605.5 327.5 L 1629.5 327.5 L 1629.5 352.5 L 1605.5 352.5 Z M 1539.5 327.5 L 1563.5 327.5 L 1563.5 352.5 L 1539.5 352.5 Z M 1473.5 327.5 L 1498.5 327.5 L 1498.5 352.5 L 1473.5 352.5 Z M 1407.5 327.5 L 1432.5 327.5 L 1432.5 352.5 L 1407.5 352.5 Z M 1342.5 327.5 L 1366.5 327.5 L 1366.5 352.5 L 1342.5 352.5 Z M 1276.5 327.5 L 1300.5 327.5 L 1300.5 352.5 L 1276.5 352.5 Z M 1210.5 327.5 L 1234.5 327.5 L 1234.5 352.5 L 1210.5 352.5 Z M 1144.5 327.5 L 1168.5 327.5 L 1168.5 352.5 L 1144.5 352.5 Z M 1078.5 327.5 L 1103.5 327.5 L 1103.5 352.5 L 1078.5 352.5 Z M 1012.5 327.5 L 1037.5 327.5 L 1037.5 352.5 L 1012.5 352.5 Z M 946.5 327.5 L 971.5 327.5 L 971.5 352.5 L 946.5 352.5 Z M 881.5 327.5 L 905.5 327.5 L 905.5 352.5 L 881.5 352.5 Z M 815.5 327.5 L 839.5 327.5 L 839.5 352.5 L 815.5 352.5 Z M 749.5 327.5 L 773.5 327.5 L 773.5 352.5 L 749.5 352.5 Z M 683.5 327.5 L 707.5 327.5 L 707.5 352.5 L 683.5 352.5 Z M 617.5 327.5 L 642.5 327.5 L 642.5 352.5 L 617.5 352.5 Z M 551.5 327.5 L 576.5 327.5 L 576.5 352.5 L 551.5 352.5 Z M 485.5 327.5 L 510.5 327.5 L 510.5 352.5 L 485.5 352.5 Z M 420.5 327.5 L 444.5 327.5 L 444.5 352.5 L 420.5 352.5 Z M 354.5 327.5 L 378.5 327.5 L 378.5 352.5 L 354.5 352.5 Z M 288.5 327.5 L 312.5 327.5 L 312.5 352.5 L 288.5 352.5 Z M 946.5 449.5 L 971.5 449.5 L 971.5 468.5 L 946.5 468.5 Z M 946.5 468.5 L 971.5 468.5 L 971.5 473.5 L 946.5 473.5 Z M 551.5 449.5 L 576.5 449.5 L 576.5 473.5 L 551.5 473.5 Z M 294.5 449.5 L 318.5 449.5 L 318.5 473.5 L 294.5 473.5 Z M 952.5 546.5 L 977.5 546.5 L 977.5 561.5 L 952.5 561.5 Z M 952.5 561.5 L 977.5 561.5 L 977.5 571.5 L 952.5 571.5 Z M 749.5 595.5 L 773.5 595.5 L 773.5 601.5 L 749.5 601.5 Z M 617.5 595.5 L 642.5 595.5 L 642.5 608.5 L 617.5 608.5 Z M 354.5 595.5 L 378.5 595.5 L 378.5 619.5 L 354.5 619.5 Z M 749.5 601.5 L 773.5 601.5 L 773.5 619.5 L 749.5 619.5 Z M 617.5 608.5 L 642.5 608.5 L 642.5 619.5 L 617.5 619.5 Z M 1210.5 595.5 L 1234.5 595.5 L 1234.5 619.5 L 1210.5 619.5 Z M 222.5 717.5 L 246.5 717.5 L 246.5 741.5 L 222.5 741.5 Z M 1671.5 717.5 L 1695.5 717.5 L 1695.5 741.5 L 1671.5 741.5 Z M 1605.5 717.5 L 1629.5 717.5 L 1629.5 741.5 L 1605.5 741.5 Z M 1539.5 717.5 L 1563.5 717.5 L 1563.5 741.5 L 1539.5 741.5 Z M 1473.5 717.5 L 1498.5 717.5 L 1498.5 741.5 L 1473.5 741.5 Z M 1407.5 717.5 L 1432.5 717.5 L 1432.5 741.5 L 1407.5 741.5 Z M 1342.5 717.5 L 1366.5 717.5 L 1366.5 741.5 L 1342.5 741.5 Z M 1276.5 717.5 L 1300.5 717.5 L 1300.5 741.5 L 1276.5 741.5 Z M 1210.5 717.5 L 1234.5 717.5 L 1234.5 741.5 L 1210.5 741.5 Z M 1144.5 717.5 L 1168.5 717.5 L 1168.5 741.5 L 1144.5 741.5 Z M 1078.5 717.5 L 1103.5 717.5 L 1103.5 741.5 L 1078.5 741.5 Z M 1012.5 717.5 L 1037.5 717.5 L 1037.5 741.5 L 1012.5 741.5 Z M 946.5 717.5 L 971.5 717.5 L 971.5 741.5 L 946.5 741.5 Z M 881.5 717.5 L 905.5 717.5 L 905.5 741.5 L 881.5 741.5 Z M 815.5 717.5 L 839.5 717.5 L 839.5 741.5 L 815.5 741.5 Z M 749.5 717.5 L 773.5 717.5 L 773.5 741.5 L 749.5 741.5 Z M 683.5 717.5 L 707.5 717.5 L 707.5 741.5 L 683.5 741.5 Z M 617.5 717.5 L 642.5 717.5 L 642.5 741.5 L 617.5 741.5 Z M 551.5 717.5 L 576.5 717.5 L 576.5 741.5 L 551.5 741.5 Z M 485.5 717.5 L 510.5 717.5 L 510.5 741.5 L 485.5 741.5 Z M 420.5 717.5 L 444.5 717.5 L 444.5 741.5 L 420.5 741.5 Z M 354.5 717.5 L 378.5 717.5 L 378.5 741.5 L 354.5 741.5 Z M 288.5 717.5 L 312.5 717.5 L 312.5 741.5 L 288.5 741.5 Z M 288.5 717.5 "/>
 </clipPath>
-<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image479" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image452"/>
+  <use xlink:href="#image479"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface446">
+<g id="surface473">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -240,6 +240,5 @@
 <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 234 346 L 234 353 M 230 350 L 237 350 " 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 234 350 L 234 350 M 234 350 L 234 350 M 234 350 L 234 350 M 234 350 L 234 350 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 201 347 L 201 352 M 198 350 L 203 350 " 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 345 L 201 354 M 196 350 L 205 350 M 200 351 L 202 351 M 200 349 L 202 349 M 200 349 L 200 351 M 202 349 L 202 351 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.svg b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.svg
index 7b3d7a6..4f9c608 100644
--- a/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.svg
+++ b/cells/dfsbp/sky130_fd_sc_hd__dfsbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image481" 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="#image453"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image453"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1334.5 599.5 L 1355.5 599.5 L 1355.5 689.5 L 1334.5 689.5 Z M 582.5 639.5 L 603.5 639.5 L 603.5 689.5 L 582.5 689.5 Z M 507.5 639.5 L 527.5 639.5 L 527.5 689.5 L 507.5 689.5 Z M 648.5 631.5 L 669.5 631.5 L 669.5 689.5 L 648.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 776.5 631.5 L 797.5 631.5 L 797.5 689.5 L 776.5 689.5 Z M 1120.5 631.5 L 1140.5 631.5 L 1140.5 689.5 L 1120.5 689.5 Z M 1070.5 631.5 L 1091.5 631.5 L 1091.5 689.5 L 1070.5 689.5 Z M 1021.5 631.5 L 1041.5 631.5 L 1041.5 689.5 L 1021.5 689.5 Z M 955.5 631.5 L 975.5 631.5 L 975.5 689.5 L 955.5 689.5 Z M 905.5 631.5 L 926.5 631.5 L 926.5 689.5 L 905.5 689.5 Z M 727.5 631.5 L 747.5 631.5 L 747.5 689.5 L 727.5 689.5 Z M 1205.5 614.5 L 1226.5 614.5 L 1226.5 689.5 L 1205.5 689.5 Z M 442.5 601.5 L 462.5 601.5 L 462.5 689.5 L 442.5 689.5 Z M 1636.5 599.5 L 1657.5 599.5 L 1657.5 689.5 L 1636.5 689.5 Z M 1579.5 599.5 L 1599.5 599.5 L 1599.5 689.5 L 1579.5 689.5 Z M 1521.5 599.5 L 1542.5 599.5 L 1542.5 689.5 L 1521.5 689.5 Z M 1392.5 599.5 L 1412.5 599.5 L 1412.5 689.5 L 1392.5 689.5 Z M 1392.5 599.5 "/>
 </clipPath>
-<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image454"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1139.5 379.5 L 1160.5 379.5 L 1160.5 437.5 L 1139.5 437.5 Z M 1010.5 379.5 L 1030.5 379.5 L 1030.5 437.5 L 1010.5 437.5 Z M 960.5 379.5 L 981.5 379.5 L 981.5 437.5 L 960.5 437.5 Z M 508.5 379.5 L 529.5 379.5 L 529.5 437.5 L 508.5 437.5 Z M 886.5 379.5 L 907.5 379.5 L 907.5 437.5 L 886.5 437.5 Z M 566.5 379.5 L 587.5 379.5 L 587.5 437.5 L 566.5 437.5 Z M 837.5 379.5 L 857.5 379.5 L 857.5 437.5 L 837.5 437.5 Z M 779.5 379.5 L 800.5 379.5 L 800.5 437.5 L 779.5 437.5 Z M 721.5 379.5 L 742.5 379.5 L 742.5 437.5 L 721.5 437.5 Z M 648.5 379.5 L 669.5 379.5 L 669.5 437.5 L 648.5 437.5 Z M 255.5 384.5 L 275.5 384.5 L 275.5 472.5 L 255.5 472.5 Z M 312.5 384.5 L 333.5 384.5 L 333.5 472.5 L 312.5 472.5 Z M 442.5 379.5 L 462.5 379.5 L 462.5 495.5 L 442.5 495.5 Z M 1205.5 379.5 L 1226.5 379.5 L 1226.5 495.5 L 1205.5 495.5 Z M 1579.5 379.5 L 1599.5 379.5 L 1599.5 517.5 L 1579.5 517.5 Z M 1392.5 379.5 L 1412.5 379.5 L 1412.5 517.5 L 1392.5 517.5 Z M 1636.5 379.5 L 1657.5 379.5 L 1657.5 517.5 L 1636.5 517.5 Z M 1521.5 379.5 L 1542.5 379.5 L 1542.5 517.5 L 1521.5 517.5 Z M 1334.5 379.5 L 1355.5 379.5 L 1355.5 517.5 L 1334.5 517.5 Z M 1334.5 379.5 "/>
 </clipPath>
-<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image455"/>
+  <use xlink:href="#image483"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 916.5 452.5 L 939.5 452.5 L 939.5 470.5 L 916.5 470.5 Z M 916.5 470.5 L 939.5 470.5 L 939.5 476.5 L 916.5 476.5 Z M 536.5 452.5 L 560.5 452.5 L 560.5 476.5 L 536.5 476.5 Z M 289.5 452.5 L 312.5 452.5 L 312.5 476.5 L 289.5 476.5 Z M 921.5 546.5 L 945.5 546.5 L 945.5 559.5 L 921.5 559.5 Z M 921.5 559.5 L 945.5 559.5 L 945.5 569.5 L 921.5 569.5 Z M 726.5 592.5 L 749.5 592.5 L 749.5 598.5 L 726.5 598.5 Z M 600.5 592.5 L 623.5 592.5 L 623.5 605.5 L 600.5 605.5 Z M 1168.5 592.5 L 1192.5 592.5 L 1192.5 616.5 L 1168.5 616.5 Z M 347.5 592.5 L 370.5 592.5 L 370.5 616.5 L 347.5 616.5 Z M 726.5 598.5 L 749.5 598.5 L 749.5 616.5 L 726.5 616.5 Z M 600.5 605.5 L 623.5 605.5 L 623.5 616.5 L 600.5 616.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image484"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface450">
+<g id="surface478">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -243,6 +243,5 @@
 <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 232 354 L 232 361 M 228 358 L 235 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 232 358 L 232 358 M 232 358 L 232 358 M 232 358 L 232 358 M 232 358 L 232 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.svg b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.svg
index 6cc632a..08fd373 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_1.svg
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image353" 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="#image353"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1571.5 609.5 L 1594.5 609.5 L 1594.5 710.5 L 1571.5 710.5 Z M 552.5 654.5 L 576.5 654.5 L 576.5 710.5 L 552.5 710.5 Z M 638.5 654.5 L 662.5 654.5 L 662.5 710.5 L 638.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 1497.5 645.5 L 1520.5 645.5 L 1520.5 710.5 L 1497.5 710.5 Z M 1193.5 645.5 L 1217.5 645.5 L 1217.5 710.5 L 1193.5 710.5 Z M 1137.5 645.5 L 1160.5 645.5 L 1160.5 710.5 L 1137.5 710.5 Z M 1062.5 645.5 L 1085.5 645.5 L 1085.5 710.5 L 1062.5 710.5 Z M 1006.5 645.5 L 1029.5 645.5 L 1029.5 710.5 L 1006.5 710.5 Z M 859.5 645.5 L 882.5 645.5 L 882.5 710.5 L 859.5 710.5 Z M 802.5 645.5 L 826.5 645.5 L 826.5 710.5 L 802.5 710.5 Z M 713.5 645.5 L 737.5 645.5 L 737.5 710.5 L 713.5 710.5 Z M 1253.5 645.5 L 1276.5 645.5 L 1276.5 710.5 L 1253.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 1350.5 626.5 L 1373.5 626.5 L 1373.5 710.5 L 1350.5 710.5 Z M 478.5 610.5 L 501.5 610.5 L 501.5 710.5 L 478.5 710.5 Z M 478.5 610.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1275.5 358.5 L 1298.5 358.5 L 1298.5 424.5 L 1275.5 424.5 Z M 1128.5 358.5 L 1151.5 358.5 L 1151.5 424.5 L 1128.5 424.5 Z M 927.5 358.5 L 951.5 358.5 L 951.5 424.5 L 927.5 424.5 Z M 862.5 358.5 L 885.5 358.5 L 885.5 424.5 L 862.5 424.5 Z M 554.5 358.5 L 577.5 358.5 L 577.5 424.5 L 554.5 424.5 Z M 796.5 358.5 L 820.5 358.5 L 820.5 424.5 L 796.5 424.5 Z M 713.5 358.5 L 737.5 358.5 L 737.5 424.5 L 713.5 424.5 Z M 1071.5 358.5 L 1095.5 358.5 L 1095.5 424.5 L 1071.5 424.5 Z M 619.5 358.5 L 643.5 358.5 L 643.5 424.5 L 619.5 424.5 Z M 987.5 358.5 L 1010.5 358.5 L 1010.5 424.5 L 987.5 424.5 Z M 1497.5 358.5 L 1520.5 358.5 L 1520.5 459.5 L 1497.5 459.5 Z M 331.5 363.5 L 354.5 363.5 L 354.5 463.5 L 331.5 463.5 Z M 265.5 363.5 L 289.5 363.5 L 289.5 463.5 L 265.5 463.5 Z M 1350.5 358.5 L 1373.5 358.5 L 1373.5 490.5 L 1350.5 490.5 Z M 478.5 358.5 L 501.5 358.5 L 501.5 490.5 L 478.5 490.5 Z M 1571.5 358.5 L 1594.5 358.5 L 1594.5 515.5 L 1571.5 515.5 Z M 1571.5 358.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 1024.5 441.5 L 1051.5 441.5 L 1051.5 462.5 L 1024.5 462.5 Z M 1024.5 462.5 L 1051.5 462.5 L 1051.5 468.5 L 1024.5 468.5 Z M 590.5 441.5 L 616.5 441.5 L 616.5 468.5 L 590.5 468.5 Z M 299.5 441.5 L 325.5 441.5 L 325.5 468.5 L 299.5 468.5 Z M 1024.5 548.5 L 1051.5 548.5 L 1051.5 563.5 L 1024.5 563.5 Z M 1024.5 563.5 L 1051.5 563.5 L 1051.5 574.5 L 1024.5 574.5 Z M 805.5 601.5 L 832.5 601.5 L 832.5 607.5 L 805.5 607.5 Z M 662.5 601.5 L 688.5 601.5 L 688.5 615.5 L 662.5 615.5 Z M 371.5 601.5 L 397.5 601.5 L 397.5 627.5 L 371.5 627.5 Z M 1315.5 601.5 L 1342.5 601.5 L 1342.5 627.5 L 1315.5 627.5 Z M 805.5 607.5 L 832.5 607.5 L 832.5 627.5 L 805.5 627.5 Z M 662.5 615.5 L 688.5 615.5 L 688.5 627.5 L 662.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface376">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 226 345 L 253 345 M 226 319 L 253 319 M 226 319 L 226 345 M 253 319 L 253 345 " 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 226 345 L 253 345 M 226 319 L 253 319 M 253 345 L 253 319 M 226 345 L 226 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.svg b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.svg
index 0b9dd6f..e777d80 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_2.svg
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image390" 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="#image390"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1628.5 609.5 L 1651.5 609.5 L 1651.5 710.5 L 1628.5 710.5 Z M 552.5 654.5 L 576.5 654.5 L 576.5 710.5 L 552.5 710.5 Z M 638.5 654.5 L 662.5 654.5 L 662.5 710.5 L 638.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 1253.5 645.5 L 1276.5 645.5 L 1276.5 710.5 L 1253.5 710.5 Z M 1196.5 645.5 L 1220.5 645.5 L 1220.5 710.5 L 1196.5 710.5 Z M 1140.5 645.5 L 1164.5 645.5 L 1164.5 710.5 L 1140.5 710.5 Z M 1062.5 645.5 L 1085.5 645.5 L 1085.5 710.5 L 1062.5 710.5 Z M 1006.5 645.5 L 1029.5 645.5 L 1029.5 710.5 L 1006.5 710.5 Z M 859.5 645.5 L 882.5 645.5 L 882.5 710.5 L 859.5 710.5 Z M 802.5 645.5 L 826.5 645.5 L 826.5 710.5 L 802.5 710.5 Z M 713.5 645.5 L 737.5 645.5 L 737.5 710.5 L 713.5 710.5 Z M 1350.5 626.5 L 1373.5 626.5 L 1373.5 710.5 L 1350.5 710.5 Z M 478.5 610.5 L 501.5 610.5 L 501.5 710.5 L 478.5 710.5 Z M 1562.5 609.5 L 1586.5 609.5 L 1586.5 710.5 L 1562.5 710.5 Z M 1497.5 609.5 L 1520.5 609.5 L 1520.5 710.5 L 1497.5 710.5 Z M 1497.5 609.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1271.5 358.5 L 1295.5 358.5 L 1295.5 424.5 L 1271.5 424.5 Z M 984.5 358.5 L 1007.5 358.5 L 1007.5 424.5 L 984.5 424.5 Z M 927.5 358.5 L 951.5 358.5 L 951.5 424.5 L 927.5 424.5 Z M 862.5 358.5 L 885.5 358.5 L 885.5 424.5 L 862.5 424.5 Z M 554.5 358.5 L 577.5 358.5 L 577.5 424.5 L 554.5 424.5 Z M 619.5 358.5 L 643.5 358.5 L 643.5 424.5 L 619.5 424.5 Z M 796.5 358.5 L 820.5 358.5 L 820.5 424.5 L 796.5 424.5 Z M 1124.5 358.5 L 1148.5 358.5 L 1148.5 424.5 L 1124.5 424.5 Z M 713.5 358.5 L 737.5 358.5 L 737.5 424.5 L 713.5 424.5 Z M 1068.5 358.5 L 1092.5 358.5 L 1092.5 424.5 L 1068.5 424.5 Z M 265.5 363.5 L 289.5 363.5 L 289.5 463.5 L 265.5 463.5 Z M 331.5 363.5 L 354.5 363.5 L 354.5 463.5 L 331.5 463.5 Z M 478.5 358.5 L 501.5 358.5 L 501.5 490.5 L 478.5 490.5 Z M 1346.5 358.5 L 1369.5 358.5 L 1369.5 490.5 L 1346.5 490.5 Z M 1497.5 358.5 L 1520.5 358.5 L 1520.5 515.5 L 1497.5 515.5 Z M 1628.5 358.5 L 1651.5 358.5 L 1651.5 515.5 L 1628.5 515.5 Z M 1562.5 358.5 L 1586.5 358.5 L 1586.5 515.5 L 1562.5 515.5 Z M 1562.5 358.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 1017.5 441.5 L 1044.5 441.5 L 1044.5 462.5 L 1017.5 462.5 Z M 1017.5 462.5 L 1044.5 462.5 L 1044.5 468.5 L 1017.5 468.5 Z M 586.5 441.5 L 612.5 441.5 L 612.5 468.5 L 586.5 468.5 Z M 298.5 441.5 L 325.5 441.5 L 325.5 468.5 L 298.5 468.5 Z M 1020.5 548.5 L 1047.5 548.5 L 1047.5 563.5 L 1020.5 563.5 Z M 1020.5 563.5 L 1047.5 563.5 L 1047.5 574.5 L 1020.5 574.5 Z M 802.5 601.5 L 828.5 601.5 L 828.5 607.5 L 802.5 607.5 Z M 658.5 601.5 L 684.5 601.5 L 684.5 615.5 L 658.5 615.5 Z M 370.5 601.5 L 397.5 601.5 L 397.5 627.5 L 370.5 627.5 Z M 802.5 607.5 L 828.5 607.5 L 828.5 627.5 L 802.5 627.5 Z M 658.5 615.5 L 684.5 615.5 L 684.5 627.5 L 658.5 627.5 Z M 1305.5 601.5 L 1332.5 601.5 L 1332.5 627.5 L 1305.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image393"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface387">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,5 @@
 <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 226 345 L 253 345 M 226 319 L 253 319 M 226 319 L 226 345 M 253 319 L 253 345 " 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 226 345 L 253 345 M 226 319 L 253 319 M 253 345 L 253 319 M 226 345 L 226 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.svg b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.svg
index 598fbb1..d6745b2 100644
--- a/cells/dfstp/sky130_fd_sc_hd__dfstp_4.svg
+++ b/cells/dfstp/sky130_fd_sc_hd__dfstp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image372" 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="#image372"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <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="#image399"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1399.5 599.5 L 1420.5 599.5 L 1420.5 689.5 L 1399.5 689.5 Z M 582.5 639.5 L 603.5 639.5 L 603.5 689.5 L 582.5 689.5 Z M 507.5 639.5 L 527.5 639.5 L 527.5 689.5 L 507.5 689.5 Z M 727.5 631.5 L 747.5 631.5 L 747.5 689.5 L 727.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 1334.5 631.5 L 1355.5 631.5 L 1355.5 689.5 L 1334.5 689.5 Z M 648.5 631.5 L 669.5 631.5 L 669.5 689.5 L 648.5 689.5 Z M 1120.5 631.5 L 1140.5 631.5 L 1140.5 689.5 L 1120.5 689.5 Z M 1070.5 631.5 L 1091.5 631.5 L 1091.5 689.5 L 1070.5 689.5 Z M 1021.5 631.5 L 1041.5 631.5 L 1041.5 689.5 L 1021.5 689.5 Z M 955.5 631.5 L 975.5 631.5 L 975.5 689.5 L 955.5 689.5 Z M 905.5 631.5 L 926.5 631.5 L 926.5 689.5 L 905.5 689.5 Z M 776.5 631.5 L 797.5 631.5 L 797.5 689.5 L 776.5 689.5 Z M 1205.5 614.5 L 1226.5 614.5 L 1226.5 689.5 L 1205.5 689.5 Z M 442.5 601.5 L 462.5 601.5 L 462.5 689.5 L 442.5 689.5 Z M 1630.5 599.5 L 1651.5 599.5 L 1651.5 689.5 L 1630.5 689.5 Z M 1572.5 599.5 L 1593.5 599.5 L 1593.5 689.5 L 1572.5 689.5 Z M 1515.5 599.5 L 1535.5 599.5 L 1535.5 689.5 L 1515.5 689.5 Z M 1457.5 599.5 L 1478.5 599.5 L 1478.5 689.5 L 1457.5 689.5 Z M 1457.5 599.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image400"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1139.5 379.5 L 1160.5 379.5 L 1160.5 437.5 L 1139.5 437.5 Z M 1010.5 379.5 L 1030.5 379.5 L 1030.5 437.5 L 1010.5 437.5 Z M 566.5 379.5 L 587.5 379.5 L 587.5 437.5 L 566.5 437.5 Z M 508.5 379.5 L 529.5 379.5 L 529.5 437.5 L 508.5 437.5 Z M 960.5 379.5 L 981.5 379.5 L 981.5 437.5 L 960.5 437.5 Z M 886.5 379.5 L 907.5 379.5 L 907.5 437.5 L 886.5 437.5 Z M 648.5 379.5 L 669.5 379.5 L 669.5 437.5 L 648.5 437.5 Z M 837.5 379.5 L 857.5 379.5 L 857.5 437.5 L 837.5 437.5 Z M 779.5 379.5 L 800.5 379.5 L 800.5 437.5 L 779.5 437.5 Z M 721.5 379.5 L 742.5 379.5 L 742.5 437.5 L 721.5 437.5 Z M 1334.5 379.5 L 1355.5 379.5 L 1355.5 467.5 L 1334.5 467.5 Z M 312.5 384.5 L 333.5 384.5 L 333.5 472.5 L 312.5 472.5 Z M 255.5 384.5 L 275.5 384.5 L 275.5 472.5 L 255.5 472.5 Z M 442.5 379.5 L 462.5 379.5 L 462.5 495.5 L 442.5 495.5 Z M 1205.5 379.5 L 1226.5 379.5 L 1226.5 495.5 L 1205.5 495.5 Z M 1515.5 379.5 L 1535.5 379.5 L 1535.5 517.5 L 1515.5 517.5 Z M 1399.5 379.5 L 1420.5 379.5 L 1420.5 517.5 L 1399.5 517.5 Z M 1457.5 379.5 L 1478.5 379.5 L 1478.5 517.5 L 1457.5 517.5 Z M 1630.5 379.5 L 1651.5 379.5 L 1651.5 517.5 L 1630.5 517.5 Z M 1572.5 379.5 L 1593.5 379.5 L 1593.5 517.5 L 1572.5 517.5 Z M 1572.5 379.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 916.5 452.5 L 939.5 452.5 L 939.5 470.5 L 916.5 470.5 Z M 916.5 470.5 L 939.5 470.5 L 939.5 476.5 L 916.5 476.5 Z M 536.5 452.5 L 560.5 452.5 L 560.5 476.5 L 536.5 476.5 Z M 285.5 452.5 L 308.5 452.5 L 308.5 476.5 L 285.5 476.5 Z M 918.5 546.5 L 942.5 546.5 L 942.5 559.5 L 918.5 559.5 Z M 918.5 559.5 L 942.5 559.5 L 942.5 569.5 L 918.5 569.5 Z M 726.5 592.5 L 749.5 592.5 L 749.5 598.5 L 726.5 598.5 Z M 600.5 592.5 L 623.5 592.5 L 623.5 605.5 L 600.5 605.5 Z M 1168.5 592.5 L 1192.5 592.5 L 1192.5 616.5 L 1168.5 616.5 Z M 347.5 592.5 L 370.5 592.5 L 370.5 616.5 L 347.5 616.5 Z M 726.5 598.5 L 749.5 598.5 L 749.5 616.5 L 726.5 616.5 Z M 600.5 605.5 L 623.5 605.5 L 623.5 616.5 L 600.5 616.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface369">
+<g id="surface396">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -206,6 +206,5 @@
 <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 220 370 L 244 370 M 220 346 L 244 346 M 220 346 L 220 370 M 244 346 L 244 370 " 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 220 370 L 244 370 M 220 346 L 244 346 M 244 370 L 244 346 M 220 370 L 220 346 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.svg b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.svg
index 92eebcd..19dd79d 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.svg
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 232.5 754.5 "/>
 </clipPath>
 <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="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1373.5 616.5 L 1399.5 616.5 L 1399.5 728.5 L 1373.5 728.5 Z M 965.5 666.5 L 991.5 666.5 L 991.5 728.5 L 965.5 728.5 Z M 690.5 666.5 L 716.5 666.5 L 716.5 728.5 L 690.5 728.5 Z M 605.5 666.5 L 631.5 666.5 L 631.5 728.5 L 605.5 728.5 Z M 1056.5 666.5 L 1082.5 666.5 L 1082.5 728.5 L 1056.5 728.5 Z M 1138.5 656.5 L 1164.5 656.5 L 1164.5 728.5 L 1138.5 728.5 Z M 1535.5 656.5 L 1561.5 656.5 L 1561.5 728.5 L 1535.5 728.5 Z M 509.5 656.5 L 535.5 656.5 L 535.5 728.5 L 509.5 728.5 Z M 275.5 656.5 L 301.5 656.5 L 301.5 728.5 L 275.5 728.5 Z M 775.5 656.5 L 801.5 656.5 L 801.5 728.5 L 775.5 728.5 Z M 347.5 656.5 L 373.5 656.5 L 373.5 728.5 L 347.5 728.5 Z M 878.5 618.5 L 904.5 618.5 L 904.5 728.5 L 878.5 728.5 Z M 1617.5 616.5 L 1643.5 616.5 L 1643.5 728.5 L 1617.5 728.5 Z M 1301.5 616.5 L 1327.5 616.5 L 1327.5 728.5 L 1301.5 728.5 Z M 1301.5 616.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1118.5 341.5 L 1144.5 341.5 L 1144.5 413.5 L 1118.5 413.5 Z M 752.5 341.5 L 778.5 341.5 L 778.5 413.5 L 752.5 413.5 Z M 664.5 341.5 L 689.5 341.5 L 689.5 413.5 L 664.5 413.5 Z M 582.5 341.5 L 608.5 341.5 L 608.5 413.5 L 582.5 413.5 Z M 1020.5 341.5 L 1046.5 341.5 L 1046.5 413.5 L 1020.5 413.5 Z M 509.5 341.5 L 535.5 341.5 L 535.5 413.5 L 509.5 413.5 Z M 948.5 341.5 L 973.5 341.5 L 973.5 413.5 L 948.5 413.5 Z M 1534.5 341.5 L 1559.5 341.5 L 1559.5 451.5 L 1534.5 451.5 Z M 347.5 346.5 L 373.5 346.5 L 373.5 456.5 L 347.5 456.5 Z M 275.5 346.5 L 301.5 346.5 L 301.5 456.5 L 275.5 456.5 Z M 866.5 341.5 L 892.5 341.5 L 892.5 470.5 L 866.5 470.5 Z M 1617.5 341.5 L 1643.5 341.5 L 1643.5 513.5 L 1617.5 513.5 Z M 1372.5 341.5 L 1398.5 341.5 L 1398.5 513.5 L 1372.5 513.5 Z M 1299.5 341.5 L 1325.5 341.5 L 1325.5 513.5 L 1299.5 513.5 Z M 1299.5 341.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 677.5 432.5 L 706.5 432.5 L 706.5 455.5 L 677.5 455.5 Z M 677.5 455.5 L 706.5 455.5 L 706.5 461.5 L 677.5 461.5 Z M 315.5 432.5 L 344.5 432.5 L 344.5 461.5 L 315.5 461.5 Z M 947.5 432.5 L 976.5 432.5 L 976.5 461.5 L 947.5 461.5 Z M 588.5 491.5 L 617.5 491.5 L 617.5 520.5 L 588.5 520.5 Z M 1022.5 491.5 L 1051.5 491.5 L 1051.5 520.5 L 1022.5 520.5 Z M 383.5 491.5 L 412.5 491.5 L 412.5 520.5 L 383.5 520.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 246 774 L 246 781 M 242 778 L 249 778 " 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 246 778 L 246 778 M 246 778 L 246 778 M 246 778 L 246 778 M 246 778 L 246 778 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.svg b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.svg
index a36b931..fd59592 100644
--- a/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.svg
+++ b/cells/dfxbp/sky130_fd_sc_hd__dfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1329.5 609.5 L 1353.5 609.5 L 1353.5 710.5 L 1329.5 710.5 Z M 565.5 654.5 L 589.5 654.5 L 589.5 710.5 L 565.5 710.5 Z M 975.5 654.5 L 999.5 654.5 L 999.5 710.5 L 975.5 710.5 Z M 892.5 654.5 L 916.5 654.5 L 916.5 710.5 L 892.5 710.5 Z M 643.5 654.5 L 666.5 654.5 L 666.5 710.5 L 643.5 710.5 Z M 720.5 645.5 L 744.5 645.5 L 744.5 710.5 L 720.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 1049.5 645.5 L 1073.5 645.5 L 1073.5 710.5 L 1049.5 710.5 Z M 478.5 645.5 L 501.5 645.5 L 501.5 710.5 L 478.5 710.5 Z M 1486.5 645.5 L 1510.5 645.5 L 1510.5 710.5 L 1486.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 813.5 610.5 L 837.5 610.5 L 837.5 710.5 L 813.5 710.5 Z M 1198.5 609.5 L 1221.5 609.5 L 1221.5 710.5 L 1198.5 710.5 Z M 1628.5 609.5 L 1651.5 609.5 L 1651.5 710.5 L 1628.5 710.5 Z M 1562.5 609.5 L 1586.5 609.5 L 1586.5 710.5 L 1562.5 710.5 Z M 1264.5 609.5 L 1287.5 609.5 L 1287.5 710.5 L 1264.5 710.5 Z M 1264.5 609.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1031.5 358.5 L 1055.5 358.5 L 1055.5 424.5 L 1031.5 424.5 Z M 942.5 358.5 L 966.5 358.5 L 966.5 424.5 L 942.5 424.5 Z M 877.5 358.5 L 900.5 358.5 L 900.5 424.5 L 877.5 424.5 Z M 699.5 358.5 L 723.5 358.5 L 723.5 424.5 L 699.5 424.5 Z M 619.5 358.5 L 642.5 358.5 L 642.5 424.5 L 619.5 424.5 Z M 544.5 358.5 L 568.5 358.5 L 568.5 424.5 L 544.5 424.5 Z M 478.5 358.5 L 501.5 358.5 L 501.5 424.5 L 478.5 424.5 Z M 1486.5 358.5 L 1510.5 358.5 L 1510.5 459.5 L 1486.5 459.5 Z M 265.5 363.5 L 289.5 363.5 L 289.5 463.5 L 265.5 463.5 Z M 331.5 363.5 L 354.5 363.5 L 354.5 463.5 L 331.5 463.5 Z M 802.5 358.5 L 826.5 358.5 L 826.5 476.5 L 802.5 476.5 Z M 1262.5 358.5 L 1285.5 358.5 L 1285.5 515.5 L 1262.5 515.5 Z M 1562.5 358.5 L 1586.5 358.5 L 1586.5 515.5 L 1562.5 515.5 Z M 1628.5 358.5 L 1651.5 358.5 L 1651.5 515.5 L 1628.5 515.5 Z M 1196.5 358.5 L 1220.5 358.5 L 1220.5 515.5 L 1196.5 515.5 Z M 1328.5 358.5 L 1351.5 358.5 L 1351.5 515.5 L 1328.5 515.5 Z M 1328.5 358.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 630.5 441.5 L 657.5 441.5 L 657.5 462.5 L 630.5 462.5 Z M 630.5 462.5 L 657.5 462.5 L 657.5 468.5 L 630.5 468.5 Z M 302.5 441.5 L 329.5 441.5 L 329.5 468.5 L 302.5 468.5 Z M 876.5 441.5 L 902.5 441.5 L 902.5 468.5 L 876.5 468.5 Z M 550.5 494.5 L 576.5 494.5 L 576.5 521.5 L 550.5 521.5 Z M 944.5 494.5 L 970.5 494.5 L 970.5 521.5 L 944.5 521.5 Z M 364.5 494.5 L 390.5 494.5 L 390.5 521.5 L 364.5 521.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 239 753 L 239 760 M 235 757 L 242 757 " 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 239 757 L 239 757 M 239 757 L 239 757 M 239 757 L 239 757 M 239 757 L 239 757 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.svg b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.svg
index e49361d..b88ab22 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.svg
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image297"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1586.5 631.5 L 1616.5 631.5 L 1616.5 763.5 L 1586.5 763.5 Z M 682.5 690.5 L 712.5 690.5 L 712.5 763.5 L 682.5 763.5 Z M 782.5 690.5 L 812.5 690.5 L 812.5 763.5 L 782.5 763.5 Z M 1105.5 690.5 L 1136.5 690.5 L 1136.5 763.5 L 1105.5 763.5 Z M 1213.5 690.5 L 1243.5 690.5 L 1243.5 763.5 L 1213.5 763.5 Z M 1309.5 678.5 L 1340.5 678.5 L 1340.5 763.5 L 1309.5 763.5 Z M 292.5 678.5 L 323.5 678.5 L 323.5 763.5 L 292.5 763.5 Z M 882.5 678.5 L 913.5 678.5 L 913.5 763.5 L 882.5 763.5 Z M 568.5 678.5 L 598.5 678.5 L 598.5 763.5 L 568.5 763.5 Z M 377.5 678.5 L 408.5 678.5 L 408.5 763.5 L 377.5 763.5 Z M 1003.5 633.5 L 1033.5 633.5 L 1033.5 763.5 L 1003.5 763.5 Z M 1501.5 631.5 L 1531.5 631.5 L 1531.5 763.5 L 1501.5 763.5 Z M 1501.5 631.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1286.5 307.5 L 1316.5 307.5 L 1316.5 392.5 L 1286.5 392.5 Z M 1170.5 307.5 L 1201.5 307.5 L 1201.5 392.5 L 1170.5 392.5 Z M 751.5 307.5 L 781.5 307.5 L 781.5 392.5 L 751.5 392.5 Z M 568.5 307.5 L 598.5 307.5 L 598.5 392.5 L 568.5 392.5 Z M 654.5 307.5 L 685.5 307.5 L 685.5 392.5 L 654.5 392.5 Z M 1085.5 307.5 L 1116.5 307.5 L 1116.5 392.5 L 1085.5 392.5 Z M 855.5 307.5 L 885.5 307.5 L 885.5 392.5 L 855.5 392.5 Z M 377.5 313.5 L 408.5 313.5 L 408.5 443.5 L 377.5 443.5 Z M 292.5 313.5 L 323.5 313.5 L 323.5 443.5 L 292.5 443.5 Z M 989.5 307.5 L 1019.5 307.5 L 1019.5 459.5 L 989.5 459.5 Z M 1584.5 307.5 L 1614.5 307.5 L 1614.5 510.5 L 1584.5 510.5 Z M 1499.5 307.5 L 1529.5 307.5 L 1529.5 510.5 L 1499.5 510.5 Z M 1499.5 307.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 766.5 414.5 L 800.5 414.5 L 800.5 441.5 L 766.5 441.5 Z M 766.5 441.5 L 800.5 441.5 L 800.5 449.5 L 766.5 449.5 Z M 340.5 414.5 L 374.5 414.5 L 374.5 449.5 L 340.5 449.5 Z M 1084.5 414.5 L 1119.5 414.5 L 1119.5 449.5 L 1084.5 449.5 Z M 661.5 483.5 L 696.5 483.5 L 696.5 518.5 L 661.5 518.5 Z M 1172.5 483.5 L 1207.5 483.5 L 1207.5 518.5 L 1172.5 518.5 Z M 420.5 483.5 L 454.5 483.5 L 454.5 518.5 L 420.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,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 289.496094 823.695312 L 289.496094 798.132812 L 299.351562 798.132812 L 300.894531 798.238281 L 302.332031 798.519531 L 303.664062 799.007812 L 304.890625 799.640625 L 305.976562 800.515625 L 306.992188 801.535156 L 307.835938 802.761719 L 308.535156 804.09375 L 309.0625 805.601562 L 309.449219 807.214844 L 309.660156 809.003906 L 309.765625 810.894531 L 309.660156 812.894531 L 309.414062 814.753906 L 308.992188 816.433594 L 308.429688 817.976562 L 307.695312 819.347656 L 306.785156 820.539062 L 305.800781 821.519531 L 304.714844 822.292969 L 303.523438 822.921875 L 302.226562 823.34375 L 300.824219 823.625 L 299.351562 823.695312 Z M 292.757812 820.820312 L 298.789062 820.820312 L 300.402344 820.714844 L 301.839844 820.328125 L 303.101562 819.660156 L 304.152344 818.785156 L 304.996094 817.59375 L 305.695312 816.15625 L 305.90625 815.417969 L 306.117188 814.648438 L 306.292969 813.804688 L 306.398438 812.894531 L 306.46875 811.949219 L 306.503906 810.929688 L 306.363281 808.652344 L 306.011719 806.652344 L 305.378906 804.933594 L 304.539062 803.566406 L 303.453125 802.445312 L 302.121094 801.640625 L 301.628906 801.464844 L 301.101562 801.289062 L 300.542969 801.183594 L 299.980469 801.078125 L 299.386719 801.042969 L 298.789062 801.007812 L 292.757812 801.007812 Z M 292.757812 820.820312 "/>
 <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 242 285 L 276 285 M 242 251 L 276 251 M 242 251 L 242 285 M 276 251 L 276 285 " 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 242 285 L 276 285 M 242 251 L 276 251 M 276 285 L 276 251 M 242 285 L 242 251 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.svg b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.svg
index f358818..6e9e539 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.svg
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 238.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1507.5 626.5 L 1536.5 626.5 L 1536.5 750.5 L 1507.5 750.5 Z M 748.5 681.5 L 777.5 681.5 L 777.5 750.5 L 748.5 750.5 Z M 654.5 681.5 L 682.5 681.5 L 682.5 750.5 L 654.5 750.5 Z M 1054.5 681.5 L 1082.5 681.5 L 1082.5 750.5 L 1054.5 750.5 Z M 1155.5 681.5 L 1184.5 681.5 L 1184.5 750.5 L 1155.5 750.5 Z M 1246.5 670.5 L 1275.5 670.5 L 1275.5 750.5 L 1246.5 750.5 Z M 547.5 670.5 L 575.5 670.5 L 575.5 750.5 L 547.5 750.5 Z M 286.5 670.5 L 315.5 670.5 L 315.5 750.5 L 286.5 750.5 Z M 843.5 670.5 L 872.5 670.5 L 872.5 750.5 L 843.5 750.5 Z M 367.5 670.5 L 395.5 670.5 L 395.5 750.5 L 367.5 750.5 Z M 957.5 628.5 L 986.5 628.5 L 986.5 750.5 L 957.5 750.5 Z M 1427.5 626.5 L 1455.5 626.5 L 1455.5 750.5 L 1427.5 750.5 Z M 1587.5 626.5 L 1616.5 626.5 L 1616.5 750.5 L 1587.5 750.5 Z M 1587.5 626.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1224.5 320.5 L 1253.5 320.5 L 1253.5 400.5 L 1224.5 400.5 Z M 1115.5 320.5 L 1143.5 320.5 L 1143.5 400.5 L 1115.5 400.5 Z M 817.5 320.5 L 846.5 320.5 L 846.5 400.5 L 817.5 400.5 Z M 547.5 320.5 L 575.5 320.5 L 575.5 400.5 L 547.5 400.5 Z M 719.5 320.5 L 747.5 320.5 L 747.5 400.5 L 719.5 400.5 Z M 628.5 320.5 L 657.5 320.5 L 657.5 400.5 L 628.5 400.5 Z M 1034.5 320.5 L 1063.5 320.5 L 1063.5 400.5 L 1034.5 400.5 Z M 286.5 325.5 L 315.5 325.5 L 315.5 448.5 L 286.5 448.5 Z M 367.5 325.5 L 395.5 325.5 L 395.5 448.5 L 367.5 448.5 Z M 944.5 320.5 L 972.5 320.5 L 972.5 463.5 L 944.5 463.5 Z M 1425.5 320.5 L 1453.5 320.5 L 1453.5 511.5 L 1425.5 511.5 Z M 1505.5 320.5 L 1534.5 320.5 L 1534.5 511.5 L 1505.5 511.5 Z M 1585.5 320.5 L 1614.5 320.5 L 1614.5 511.5 L 1585.5 511.5 Z M 1585.5 320.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 733.5 421.5 L 766.5 421.5 L 766.5 446.5 L 733.5 446.5 Z M 733.5 446.5 L 766.5 446.5 L 766.5 454.5 L 733.5 454.5 Z M 331.5 421.5 L 364.5 421.5 L 364.5 454.5 L 331.5 454.5 Z M 1033.5 421.5 L 1066.5 421.5 L 1066.5 454.5 L 1033.5 454.5 Z M 635.5 486.5 L 667.5 486.5 L 667.5 519.5 L 635.5 519.5 Z M 1117.5 486.5 L 1149.5 486.5 L 1149.5 519.5 L 1117.5 519.5 Z M 407.5 486.5 L 439.5 486.5 L 439.5 519.5 L 407.5 519.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,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 282.175781 807.757812 L 282.175781 784.242188 L 291.242188 784.242188 L 292.660156 784.339844 L 293.984375 784.597656 L 295.210938 785.046875 L 296.339844 785.628906 L 297.339844 786.433594 L 298.273438 787.371094 L 299.046875 788.5 L 299.695312 789.726562 L 300.175781 791.113281 L 300.53125 792.597656 L 300.726562 794.242188 L 300.824219 795.984375 L 300.726562 797.824219 L 300.5 799.53125 L 300.113281 801.082031 L 299.597656 802.5 L 298.917969 803.757812 L 298.082031 804.855469 L 297.175781 805.757812 L 296.175781 806.46875 L 295.082031 807.046875 L 293.886719 807.433594 L 292.597656 807.695312 L 291.242188 807.757812 Z M 285.175781 805.113281 L 290.726562 805.113281 L 292.210938 805.015625 L 293.53125 804.660156 L 294.695312 804.046875 L 295.660156 803.242188 L 296.433594 802.144531 L 297.082031 800.824219 L 297.273438 800.144531 L 297.46875 799.433594 L 297.628906 798.660156 L 297.726562 797.824219 L 297.789062 796.953125 L 297.824219 796.015625 L 297.695312 793.917969 L 297.371094 792.082031 L 296.789062 790.5 L 296.015625 789.242188 L 295.015625 788.210938 L 293.789062 787.46875 L 293.339844 787.304688 L 292.855469 787.144531 L 292.339844 787.046875 L 291.824219 786.953125 L 291.273438 786.917969 L 290.726562 786.886719 L 285.175781 786.886719 Z M 285.175781 805.113281 "/>
 <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 238 300 L 271 300 M 238 268 L 271 268 M 238 268 L 238 300 M 271 268 L 271 300 " 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 238 300 L 271 300 M 238 268 L 271 268 M 271 300 L 271 268 M 238 300 L 238 268 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.svg b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.svg
index 761866d..c3267dd 100644
--- a/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.svg
+++ b/cells/dfxtp/sky130_fd_sc_hd__dfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image344" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 232.5 754.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1388.5 616.5 L 1414.5 616.5 L 1414.5 728.5 L 1388.5 728.5 Z M 590.5 666.5 L 616.5 666.5 L 616.5 728.5 L 590.5 728.5 Z M 970.5 666.5 L 996.5 666.5 L 996.5 728.5 L 970.5 728.5 Z M 673.5 666.5 L 699.5 666.5 L 699.5 728.5 L 673.5 728.5 Z M 1059.5 666.5 L 1084.5 666.5 L 1084.5 728.5 L 1059.5 728.5 Z M 347.5 656.5 L 373.5 656.5 L 373.5 728.5 L 347.5 728.5 Z M 1140.5 656.5 L 1166.5 656.5 L 1166.5 728.5 L 1140.5 728.5 Z M 275.5 656.5 L 301.5 656.5 L 301.5 728.5 L 275.5 728.5 Z M 509.5 656.5 L 535.5 656.5 L 535.5 728.5 L 509.5 728.5 Z M 757.5 656.5 L 783.5 656.5 L 783.5 728.5 L 757.5 728.5 Z M 883.5 618.5 L 909.5 618.5 L 909.5 728.5 L 883.5 728.5 Z M 1306.5 616.5 L 1332.5 616.5 L 1332.5 728.5 L 1306.5 728.5 Z M 1608.5 616.5 L 1633.5 616.5 L 1633.5 728.5 L 1608.5 728.5 Z M 1535.5 616.5 L 1561.5 616.5 L 1561.5 728.5 L 1535.5 728.5 Z M 1460.5 616.5 L 1486.5 616.5 L 1486.5 728.5 L 1460.5 728.5 Z M 1460.5 616.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1121.5 341.5 L 1146.5 341.5 L 1146.5 413.5 L 1121.5 413.5 Z M 948.5 341.5 L 973.5 341.5 L 973.5 413.5 L 948.5 413.5 Z M 752.5 341.5 L 778.5 341.5 L 778.5 413.5 L 752.5 413.5 Z M 509.5 341.5 L 535.5 341.5 L 535.5 413.5 L 509.5 413.5 Z M 670.5 341.5 L 695.5 341.5 L 695.5 413.5 L 670.5 413.5 Z M 1020.5 341.5 L 1046.5 341.5 L 1046.5 413.5 L 1020.5 413.5 Z M 590.5 341.5 L 615.5 341.5 L 615.5 413.5 L 590.5 413.5 Z M 275.5 346.5 L 301.5 346.5 L 301.5 456.5 L 275.5 456.5 Z M 347.5 346.5 L 373.5 346.5 L 373.5 456.5 L 347.5 456.5 Z M 866.5 341.5 L 892.5 341.5 L 892.5 470.5 L 866.5 470.5 Z M 1608.5 341.5 L 1633.5 341.5 L 1633.5 513.5 L 1608.5 513.5 Z M 1460.5 341.5 L 1486.5 341.5 L 1486.5 513.5 L 1460.5 513.5 Z M 1535.5 341.5 L 1561.5 341.5 L 1561.5 513.5 L 1535.5 513.5 Z M 1388.5 341.5 L 1414.5 341.5 L 1414.5 513.5 L 1388.5 513.5 Z M 1306.5 341.5 L 1332.5 341.5 L 1332.5 513.5 L 1306.5 513.5 Z M 1306.5 341.5 "/>
 </clipPath>
-<image id="image318" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 312.5 432.5 L 341.5 432.5 L 341.5 461.5 L 312.5 461.5 Z M 711.5 432.5 L 740.5 432.5 L 740.5 461.5 L 711.5 461.5 Z M 948.5 432.5 L 978.5 432.5 L 978.5 461.5 L 948.5 461.5 Z M 632.5 608.5 L 661.5 608.5 L 661.5 637.5 L 632.5 637.5 Z M 948.5 608.5 L 978.5 608.5 L 978.5 637.5 L 948.5 637.5 Z M 391.5 608.5 L 420.5 608.5 L 420.5 637.5 L 391.5 637.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,5 @@
 <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 246 774 L 246 781 M 242 778 L 249 778 " 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 246 778 L 246 778 M 246 778 L 246 778 M 246 778 L 246 778 M 246 778 L 246 778 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/diode/sky130_fd_sc_hd__diode_2.svg b/cells/diode/sky130_fd_sc_hd__diode_2.svg
index 1eebde5..ce48284 100644
--- a/cells/diode/sky130_fd_sc_hd__diode_2.svg
+++ b/cells/diode/sky130_fd_sc_hd__diode_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 787.5 112.5 L 1143.5 112.5 L 1143.5 551.5 L 787.5 551.5 Z M 787.5 112.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image468" 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="#image426"/>
+  <use xlink:href="#image468"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 879.5 885.5 L 925.5 885.5 L 925.5 931.5 L 879.5 931.5 Z M 879.5 885.5 "/>
 </clipPath>
 <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="#image468"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -26,9 +26,9 @@
 <clipPath id="clip4">
   <path d="M 882.5 666.5 L 1054.5 666.5 L 1054.5 691.5 L 882.5 691.5 Z M 882.5 691.5 L 1054.5 691.5 L 1054.5 737.5 L 882.5 737.5 Z M 882.5 737.5 L 1054.5 737.5 L 1054.5 784.5 L 882.5 784.5 Z M 882.5 784.5 L 1054.5 784.5 L 1054.5 830.5 L 882.5 830.5 Z M 882.5 830.5 L 1054.5 830.5 L 1054.5 855.5 L 882.5 855.5 Z M 882.5 830.5 "/>
 </clipPath>
-<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
+<image id="image469" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
 <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="#image469"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 879.5 141.5 L 925.5 141.5 L 925.5 187.5 L 879.5 187.5 Z M 1005.5 141.5 L 1051.5 141.5 L 1051.5 187.5 L 1005.5 187.5 Z M 879.5 885.5 L 925.5 885.5 L 925.5 931.5 L 879.5 931.5 Z M 1005.5 885.5 L 1051.5 885.5 L 1051.5 931.5 L 1005.5 931.5 Z M 1005.5 885.5 "/>
 </clipPath>
-<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image428"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface423">
+<g id="surface465">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,5 @@
 <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 879 194 L 925 194 M 879 148 L 925 148 M 879 148 L 879 194 M 925 148 L 925 194 " 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 879 194 L 925 194 M 879 148 L 925 148 M 925 194 L 925 148 M 879 194 L 879 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 839 167 L 839 174 M 835 171 L 842 171 " 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 839 166 L 839 175 M 834 171 L 843 171 M 838 172 L 840 172 M 838 170 L 840 170 M 838 170 L 838 172 M 840 170 L 840 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.svg b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.svg
index d8e16f2..7e464fa 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.svg
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 537.5 L 174.5 537.5 Z M 820.5 537.5 L 1743.5 537.5 L 1743.5 548.5 L 820.5 548.5 Z M 174.5 537.5 L 447.5 537.5 L 447.5 548.5 L 174.5 548.5 Z M 174.5 537.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image346" 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="#image346"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <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="#image346"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 639.5 615.5 L 673.5 615.5 L 673.5 711.5 L 639.5 711.5 Z M 765.5 676.5 L 800.5 676.5 L 800.5 772.5 L 765.5 772.5 Z M 1465.5 698.5 L 1499.5 698.5 L 1499.5 794.5 L 1465.5 794.5 Z M 1382.5 698.5 L 1416.5 698.5 L 1416.5 794.5 L 1382.5 794.5 Z M 405.5 698.5 L 440.5 698.5 L 440.5 794.5 L 405.5 794.5 Z M 1041.5 698.5 L 1076.5 698.5 L 1076.5 794.5 L 1041.5 794.5 Z M 309.5 698.5 L 343.5 698.5 L 343.5 794.5 L 309.5 794.5 Z M 1165.5 645.5 L 1200.5 645.5 L 1200.5 794.5 L 1165.5 794.5 Z M 1574.5 645.5 L 1608.5 645.5 L 1608.5 794.5 L 1574.5 794.5 Z M 932.5 705.5 L 967.5 705.5 L 967.5 794.5 L 932.5 794.5 Z M 932.5 705.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image347"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 956.5 277.5 L 991.5 277.5 L 991.5 373.5 L 956.5 373.5 Z M 873.5 277.5 L 908.5 277.5 L 908.5 373.5 L 873.5 373.5 Z M 731.5 277.5 L 765.5 277.5 L 765.5 373.5 L 731.5 373.5 Z M 1465.5 277.5 L 1499.5 277.5 L 1499.5 424.5 L 1465.5 424.5 Z M 621.5 277.5 L 656.5 277.5 L 656.5 424.5 L 621.5 424.5 Z M 1284.5 277.5 L 1318.5 277.5 L 1318.5 424.5 L 1284.5 424.5 Z M 309.5 284.5 L 343.5 284.5 L 343.5 431.5 L 309.5 431.5 Z M 405.5 284.5 L 440.5 284.5 L 440.5 431.5 L 405.5 431.5 Z M 1175.5 277.5 L 1209.5 277.5 L 1209.5 507.5 L 1175.5 507.5 Z M 1574.5 277.5 L 1608.5 277.5 L 1608.5 507.5 L 1574.5 507.5 Z M 1574.5 277.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 1416.5 555.5 L 1455.5 555.5 L 1455.5 576.5 L 1416.5 576.5 Z M 251.5 555.5 L 290.5 555.5 L 290.5 584.5 L 251.5 584.5 Z M 251.5 584.5 L 290.5 584.5 L 290.5 594.5 L 251.5 594.5 Z M 1416.5 576.5 L 1455.5 576.5 L 1455.5 594.5 L 1416.5 594.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image349"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 252 250 L 291 250 M 252 211 L 291 211 M 252 211 L 252 250 M 291 211 L 291 250 " 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 252 250 L 291 250 M 252 211 L 291 211 M 291 250 L 291 211 M 252 250 L 252 211 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.svg b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.svg
index f4a9cb8..5bf7fb4 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.svg
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 536.5 L 174.5 536.5 Z M 781.5 536.5 L 1744.5 536.5 L 1744.5 547.5 L 781.5 547.5 Z M 174.5 536.5 L 430.5 536.5 L 430.5 547.5 L 174.5 547.5 Z M 174.5 536.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 248.5 810.5 L 284.5 810.5 L 284.5 847.5 L 248.5 847.5 Z M 248.5 810.5 "/>
 </clipPath>
 <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="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 611.5 610.5 L 643.5 610.5 L 643.5 700.5 L 611.5 700.5 Z M 729.5 667.5 L 762.5 667.5 L 762.5 757.5 L 729.5 757.5 Z M 391.5 687.5 L 423.5 687.5 L 423.5 778.5 L 391.5 778.5 Z M 1383.5 687.5 L 1415.5 687.5 L 1415.5 778.5 L 1383.5 778.5 Z M 1305.5 687.5 L 1337.5 687.5 L 1337.5 778.5 L 1305.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 988.5 687.5 L 1020.5 687.5 L 1020.5 778.5 L 988.5 778.5 Z M 1486.5 638.5 L 1518.5 638.5 L 1518.5 778.5 L 1486.5 778.5 Z M 1577.5 638.5 L 1609.5 638.5 L 1609.5 778.5 L 1577.5 778.5 Z M 1102.5 638.5 L 1135.5 638.5 L 1135.5 778.5 L 1102.5 778.5 Z M 886.5 694.5 L 918.5 694.5 L 918.5 778.5 L 886.5 778.5 Z M 886.5 694.5 "/>
 </clipPath>
-<image id="image322" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 908.5 293.5 L 941.5 293.5 L 941.5 383.5 L 908.5 383.5 Z M 697.5 293.5 L 729.5 293.5 L 729.5 383.5 L 697.5 383.5 Z M 831.5 293.5 L 863.5 293.5 L 863.5 383.5 L 831.5 383.5 Z M 1214.5 293.5 L 1247.5 293.5 L 1247.5 431.5 L 1214.5 431.5 Z M 594.5 293.5 L 626.5 293.5 L 626.5 431.5 L 594.5 431.5 Z M 1383.5 293.5 L 1415.5 293.5 L 1415.5 431.5 L 1383.5 431.5 Z M 300.5 299.5 L 333.5 299.5 L 333.5 437.5 L 300.5 437.5 Z M 391.5 299.5 L 423.5 299.5 L 423.5 437.5 L 391.5 437.5 Z M 1486.5 293.5 L 1518.5 293.5 L 1518.5 508.5 L 1486.5 508.5 Z M 1111.5 293.5 L 1143.5 293.5 L 1143.5 508.5 L 1111.5 508.5 Z M 1577.5 293.5 L 1609.5 293.5 L 1609.5 508.5 L 1577.5 508.5 Z M 1577.5 293.5 "/>
 </clipPath>
-<image id="image323" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 1338.5 554.5 L 1375.5 554.5 L 1375.5 573.5 L 1338.5 573.5 Z M 248.5 554.5 L 284.5 554.5 L 284.5 580.5 L 248.5 580.5 Z M 248.5 580.5 L 284.5 580.5 L 284.5 590.5 L 248.5 590.5 Z M 1338.5 573.5 L 1375.5 573.5 L 1375.5 590.5 L 1338.5 590.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image324" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 248 269 L 284 269 M 248 232 L 284 232 M 248 232 L 248 269 M 284 232 L 284 269 " 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 248 269 L 284 269 M 248 232 L 284 232 M 284 269 L 284 232 M 248 269 L 248 232 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.svg b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.svg
index c0075e8..5b081af 100644
--- a/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.svg
+++ b/cells/dlclkp/sky130_fd_sc_hd__dlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image402" 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="#image402"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <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="#image429"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1521.5 626.5 L 1550.5 626.5 L 1550.5 750.5 L 1521.5 750.5 Z M 732.5 681.5 L 761.5 681.5 L 761.5 750.5 L 732.5 750.5 Z M 649.5 681.5 L 678.5 681.5 L 678.5 750.5 L 649.5 750.5 Z M 547.5 670.5 L 575.5 670.5 L 575.5 750.5 L 547.5 750.5 Z M 286.5 670.5 L 315.5 670.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 670.5 L 395.5 670.5 L 395.5 750.5 L 367.5 750.5 Z M 823.5 670.5 L 852.5 670.5 L 852.5 750.5 L 823.5 750.5 Z M 1003.5 626.5 L 1032.5 626.5 L 1032.5 750.5 L 1003.5 750.5 Z M 1183.5 626.5 L 1211.5 626.5 L 1211.5 750.5 L 1183.5 750.5 Z M 1263.5 626.5 L 1292.5 626.5 L 1292.5 750.5 L 1263.5 750.5 Z M 1343.5 626.5 L 1372.5 626.5 L 1372.5 750.5 L 1343.5 750.5 Z M 1441.5 626.5 L 1470.5 626.5 L 1470.5 750.5 L 1441.5 750.5 Z M 1602.5 626.5 L 1630.5 626.5 L 1630.5 750.5 L 1602.5 750.5 Z M 1602.5 626.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image430"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 811.5 320.5 L 839.5 320.5 L 839.5 400.5 L 811.5 400.5 Z M 742.5 320.5 L 770.5 320.5 L 770.5 400.5 L 742.5 400.5 Z M 638.5 320.5 L 667.5 320.5 L 667.5 400.5 L 638.5 400.5 Z M 547.5 320.5 L 575.5 320.5 L 575.5 442.5 L 547.5 442.5 Z M 367.5 325.5 L 395.5 325.5 L 395.5 448.5 L 367.5 448.5 Z M 286.5 325.5 L 315.5 325.5 L 315.5 448.5 L 286.5 448.5 Z M 1343.5 320.5 L 1372.5 320.5 L 1372.5 511.5 L 1343.5 511.5 Z M 998.5 320.5 L 1027.5 320.5 L 1027.5 511.5 L 998.5 511.5 Z M 1252.5 320.5 L 1280.5 320.5 L 1280.5 511.5 L 1252.5 511.5 Z M 1094.5 320.5 L 1122.5 320.5 L 1122.5 511.5 L 1094.5 511.5 Z M 1602.5 320.5 L 1630.5 320.5 L 1630.5 511.5 L 1602.5 511.5 Z M 1521.5 320.5 L 1550.5 320.5 L 1550.5 511.5 L 1521.5 511.5 Z M 1441.5 320.5 L 1470.5 320.5 L 1470.5 511.5 L 1441.5 511.5 Z M 1441.5 320.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 327.5 421.5 L 360.5 421.5 L 360.5 454.5 L 327.5 454.5 Z M 503.5 421.5 L 535.5 421.5 L 535.5 454.5 L 503.5 454.5 Z M 239.5 551.5 L 272.5 551.5 L 272.5 575.5 L 239.5 575.5 Z M 239.5 575.5 L 272.5 575.5 L 272.5 584.5 L 239.5 584.5 Z M 1211.5 551.5 L 1244.5 551.5 L 1244.5 584.5 L 1211.5 584.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface399">
+<g id="surface426">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -204,6 +204,5 @@
 <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 239 300 L 272 300 M 239 268 L 272 268 M 239 268 L 239 300 M 272 268 L 272 300 " 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 239 300 L 272 300 M 239 268 L 272 268 M 272 300 L 272 268 M 239 300 L 239 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.svg b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.svg
index 7402c81..f821a11 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.svg
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image479" 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="#image451"/>
+  <use xlink:href="#image479"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image451"/>
+  <use xlink:href="#image479"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 626.5 L 1631.5 626.5 L 1631.5 750.5 L 1603.5 750.5 Z M 812.5 681.5 L 841.5 681.5 L 841.5 750.5 L 812.5 750.5 Z M 730.5 681.5 L 759.5 681.5 L 759.5 750.5 L 730.5 750.5 Z M 367.5 670.5 L 395.5 670.5 L 395.5 750.5 L 367.5 750.5 Z M 547.5 670.5 L 575.5 670.5 L 575.5 750.5 L 547.5 750.5 Z M 627.5 670.5 L 656.5 670.5 L 656.5 750.5 L 627.5 750.5 Z M 903.5 670.5 L 932.5 670.5 L 932.5 750.5 L 903.5 750.5 Z M 286.5 670.5 L 315.5 670.5 L 315.5 750.5 L 286.5 750.5 Z M 1512.5 670.5 L 1540.5 670.5 L 1540.5 750.5 L 1512.5 750.5 Z M 1083.5 626.5 L 1112.5 626.5 L 1112.5 750.5 L 1083.5 750.5 Z M 1171.5 626.5 L 1200.5 626.5 L 1200.5 750.5 L 1171.5 750.5 Z M 1332.5 626.5 L 1361.5 626.5 L 1361.5 750.5 L 1332.5 750.5 Z M 1332.5 626.5 "/>
 </clipPath>
-<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image480" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image452"/>
+  <use xlink:href="#image480"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 903.5 320.5 L 932.5 320.5 L 932.5 400.5 L 903.5 400.5 Z M 719.5 320.5 L 747.5 320.5 L 747.5 400.5 L 719.5 400.5 Z M 834.5 320.5 L 863.5 320.5 L 863.5 400.5 L 834.5 400.5 Z M 627.5 320.5 L 656.5 320.5 L 656.5 442.5 L 627.5 442.5 Z M 547.5 320.5 L 575.5 320.5 L 575.5 442.5 L 547.5 442.5 Z M 1512.5 320.5 L 1540.5 320.5 L 1540.5 442.5 L 1512.5 442.5 Z M 367.5 325.5 L 395.5 325.5 L 395.5 448.5 L 367.5 448.5 Z M 286.5 325.5 L 315.5 325.5 L 315.5 448.5 L 286.5 448.5 Z M 1083.5 320.5 L 1112.5 320.5 L 1112.5 511.5 L 1083.5 511.5 Z M 1332.5 320.5 L 1361.5 320.5 L 1361.5 511.5 L 1332.5 511.5 Z M 1171.5 320.5 L 1200.5 320.5 L 1200.5 511.5 L 1171.5 511.5 Z M 1603.5 320.5 L 1631.5 320.5 L 1631.5 511.5 L 1603.5 511.5 Z M 1603.5 320.5 "/>
 </clipPath>
-<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image453"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 415.5 421.5 L 448.5 421.5 L 448.5 436.5 L 415.5 436.5 Z M 415.5 436.5 L 448.5 436.5 L 448.5 454.5 L 415.5 454.5 Z M 683.5 421.5 L 716.5 421.5 L 716.5 454.5 L 683.5 454.5 Z M 327.5 486.5 L 360.5 486.5 L 360.5 519.5 L 327.5 519.5 Z M 771.5 486.5 L 804.5 486.5 L 804.5 519.5 L 771.5 519.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image454"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface448">
+<g id="surface476">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -236,6 +236,5 @@
 <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 256 280 L 256 287 M 252 284 L 259 284 " 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 256 284 L 256 284 M 256 284 L 256 284 M 256 284 L 256 284 M 256 284 L 256 284 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.svg b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.svg
index 03e6ed1..f172093 100644
--- a/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.svg
+++ b/cells/dlrbn/sky130_fd_sc_hd__dlrbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image400" 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="#image400"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1111.5 621.5 L 1139.5 621.5 L 1139.5 739.5 L 1111.5 739.5 Z M 779.5 673.5 L 806.5 673.5 L 806.5 739.5 L 779.5 739.5 Z M 701.5 673.5 L 728.5 673.5 L 728.5 739.5 L 701.5 739.5 Z M 1446.5 662.5 L 1473.5 662.5 L 1473.5 739.5 L 1446.5 739.5 Z M 357.5 662.5 L 384.5 662.5 L 384.5 739.5 L 357.5 739.5 Z M 603.5 662.5 L 630.5 662.5 L 630.5 739.5 L 603.5 739.5 Z M 281.5 662.5 L 308.5 662.5 L 308.5 739.5 L 281.5 739.5 Z M 527.5 662.5 L 554.5 662.5 L 554.5 739.5 L 527.5 739.5 Z M 865.5 662.5 L 892.5 662.5 L 892.5 739.5 L 865.5 739.5 Z M 1035.5 621.5 L 1063.5 621.5 L 1063.5 739.5 L 1035.5 739.5 Z M 1274.5 621.5 L 1301.5 621.5 L 1301.5 739.5 L 1274.5 739.5 Z M 1188.5 621.5 L 1215.5 621.5 L 1215.5 739.5 L 1188.5 739.5 Z M 1609.5 621.5 L 1636.5 621.5 L 1636.5 739.5 L 1609.5 739.5 Z M 1532.5 621.5 L 1559.5 621.5 L 1559.5 739.5 L 1532.5 739.5 Z M 1532.5 621.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 865.5 331.5 L 892.5 331.5 L 892.5 407.5 L 865.5 407.5 Z M 800.5 331.5 L 827.5 331.5 L 827.5 407.5 L 800.5 407.5 Z M 690.5 331.5 L 717.5 331.5 L 717.5 407.5 L 690.5 407.5 Z M 1446.5 331.5 L 1473.5 331.5 L 1473.5 447.5 L 1446.5 447.5 Z M 603.5 331.5 L 630.5 331.5 L 630.5 447.5 L 603.5 447.5 Z M 527.5 331.5 L 554.5 331.5 L 554.5 447.5 L 527.5 447.5 Z M 357.5 336.5 L 384.5 336.5 L 384.5 452.5 L 357.5 452.5 Z M 281.5 336.5 L 308.5 336.5 L 308.5 452.5 L 281.5 452.5 Z M 1532.5 331.5 L 1559.5 331.5 L 1559.5 512.5 L 1532.5 512.5 Z M 1188.5 331.5 L 1215.5 331.5 L 1215.5 512.5 L 1188.5 512.5 Z M 1111.5 331.5 L 1139.5 331.5 L 1139.5 512.5 L 1111.5 512.5 Z M 1609.5 331.5 L 1636.5 331.5 L 1636.5 512.5 L 1609.5 512.5 Z M 1274.5 331.5 L 1301.5 331.5 L 1301.5 512.5 L 1274.5 512.5 Z M 1035.5 331.5 L 1063.5 331.5 L 1063.5 512.5 L 1035.5 512.5 Z M 1035.5 331.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 403.5 427.5 L 434.5 427.5 L 434.5 441.5 L 403.5 441.5 Z M 403.5 441.5 L 434.5 441.5 L 434.5 458.5 L 403.5 458.5 Z M 657.5 427.5 L 687.5 427.5 L 687.5 458.5 L 657.5 458.5 Z M 320.5 489.5 L 350.5 489.5 L 350.5 519.5 L 320.5 519.5 Z M 740.5 489.5 L 771.5 489.5 L 771.5 519.5 L 740.5 519.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image403"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface397">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -191,6 +191,5 @@
 <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 236 313 L 267 313 M 236 282 L 267 282 M 236 282 L 236 313 M 267 282 L 267 313 " 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 236 313 L 267 313 M 236 282 L 267 282 M 267 313 L 267 282 M 236 313 L 236 282 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.svg b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.svg
index cd7c4b1..0222286 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.svg
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image425" 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="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 626.5 L 1631.5 626.5 L 1631.5 750.5 L 1603.5 750.5 Z M 812.5 681.5 L 840.5 681.5 L 840.5 750.5 L 812.5 750.5 Z M 718.5 681.5 L 746.5 681.5 L 746.5 750.5 L 718.5 750.5 Z M 367.5 670.5 L 395.5 670.5 L 395.5 750.5 L 367.5 750.5 Z M 547.5 670.5 L 575.5 670.5 L 575.5 750.5 L 547.5 750.5 Z M 627.5 670.5 L 656.5 670.5 L 656.5 750.5 L 627.5 750.5 Z M 902.5 670.5 L 931.5 670.5 L 931.5 750.5 L 902.5 750.5 Z M 286.5 670.5 L 315.5 670.5 L 315.5 750.5 L 286.5 750.5 Z M 1512.5 670.5 L 1540.5 670.5 L 1540.5 750.5 L 1512.5 750.5 Z M 1082.5 626.5 L 1111.5 626.5 L 1111.5 750.5 L 1082.5 750.5 Z M 1167.5 626.5 L 1196.5 626.5 L 1196.5 750.5 L 1167.5 750.5 Z M 1332.5 626.5 L 1361.5 626.5 L 1361.5 750.5 L 1332.5 750.5 Z M 1332.5 626.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 891.5 320.5 L 920.5 320.5 L 920.5 400.5 L 891.5 400.5 Z M 719.5 320.5 L 747.5 320.5 L 747.5 400.5 L 719.5 400.5 Z M 799.5 320.5 L 828.5 320.5 L 828.5 400.5 L 799.5 400.5 Z M 627.5 320.5 L 656.5 320.5 L 656.5 442.5 L 627.5 442.5 Z M 547.5 320.5 L 575.5 320.5 L 575.5 442.5 L 547.5 442.5 Z M 1512.5 320.5 L 1540.5 320.5 L 1540.5 442.5 L 1512.5 442.5 Z M 367.5 325.5 L 395.5 325.5 L 395.5 448.5 L 367.5 448.5 Z M 286.5 325.5 L 315.5 325.5 L 315.5 448.5 L 286.5 448.5 Z M 1079.5 320.5 L 1108.5 320.5 L 1108.5 511.5 L 1079.5 511.5 Z M 1332.5 320.5 L 1361.5 320.5 L 1361.5 511.5 L 1332.5 511.5 Z M 1167.5 320.5 L 1196.5 320.5 L 1196.5 511.5 L 1167.5 511.5 Z M 1603.5 320.5 L 1631.5 320.5 L 1631.5 511.5 L 1603.5 511.5 Z M 1603.5 320.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 415.5 421.5 L 448.5 421.5 L 448.5 436.5 L 415.5 436.5 Z M 415.5 436.5 L 448.5 436.5 L 448.5 454.5 L 415.5 454.5 Z M 770.5 421.5 L 803.5 421.5 L 803.5 454.5 L 770.5 454.5 Z M 683.5 486.5 L 716.5 486.5 L 716.5 488.5 L 683.5 488.5 Z M 683.5 488.5 L 716.5 488.5 L 716.5 519.5 L 683.5 519.5 Z M 327.5 486.5 L 360.5 486.5 L 360.5 519.5 L 327.5 519.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface394">
+<g id="surface422">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <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 256 280 L 256 287 M 252 284 L 259 284 " 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 256 284 L 256 284 M 256 284 L 256 284 M 256 284 L 256 284 M 256 284 L 256 284 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.svg b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.svg
index 0af4893..ce01794 100644
--- a/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.svg
+++ b/cells/dlrbp/sky130_fd_sc_hd__dlrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1113.5 621.5 L 1140.5 621.5 L 1140.5 739.5 L 1113.5 739.5 Z M 779.5 673.5 L 806.5 673.5 L 806.5 739.5 L 779.5 739.5 Z M 701.5 673.5 L 728.5 673.5 L 728.5 739.5 L 701.5 739.5 Z M 1448.5 662.5 L 1476.5 662.5 L 1476.5 739.5 L 1448.5 739.5 Z M 357.5 662.5 L 384.5 662.5 L 384.5 739.5 L 357.5 739.5 Z M 603.5 662.5 L 630.5 662.5 L 630.5 739.5 L 603.5 739.5 Z M 281.5 662.5 L 308.5 662.5 L 308.5 739.5 L 281.5 739.5 Z M 527.5 662.5 L 554.5 662.5 L 554.5 739.5 L 527.5 739.5 Z M 865.5 662.5 L 892.5 662.5 L 892.5 739.5 L 865.5 739.5 Z M 1035.5 621.5 L 1063.5 621.5 L 1063.5 739.5 L 1035.5 739.5 Z M 1278.5 621.5 L 1305.5 621.5 L 1305.5 739.5 L 1278.5 739.5 Z M 1198.5 621.5 L 1226.5 621.5 L 1226.5 739.5 L 1198.5 739.5 Z M 1611.5 621.5 L 1638.5 621.5 L 1638.5 739.5 L 1611.5 739.5 Z M 1535.5 621.5 L 1562.5 621.5 L 1562.5 739.5 L 1535.5 739.5 Z M 1535.5 621.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 853.5 331.5 L 880.5 331.5 L 880.5 407.5 L 853.5 407.5 Z M 766.5 331.5 L 793.5 331.5 L 793.5 407.5 L 766.5 407.5 Z M 690.5 331.5 L 717.5 331.5 L 717.5 407.5 L 690.5 407.5 Z M 1448.5 331.5 L 1476.5 331.5 L 1476.5 447.5 L 1448.5 447.5 Z M 603.5 331.5 L 630.5 331.5 L 630.5 447.5 L 603.5 447.5 Z M 527.5 331.5 L 554.5 331.5 L 554.5 447.5 L 527.5 447.5 Z M 357.5 336.5 L 384.5 336.5 L 384.5 452.5 L 357.5 452.5 Z M 281.5 336.5 L 308.5 336.5 L 308.5 452.5 L 281.5 452.5 Z M 1535.5 331.5 L 1562.5 331.5 L 1562.5 512.5 L 1535.5 512.5 Z M 1198.5 331.5 L 1226.5 331.5 L 1226.5 512.5 L 1198.5 512.5 Z M 1113.5 331.5 L 1140.5 331.5 L 1140.5 512.5 L 1113.5 512.5 Z M 1611.5 331.5 L 1638.5 331.5 L 1638.5 512.5 L 1611.5 512.5 Z M 1278.5 331.5 L 1305.5 331.5 L 1305.5 512.5 L 1278.5 512.5 Z M 1035.5 331.5 L 1063.5 331.5 L 1063.5 512.5 L 1035.5 512.5 Z M 1035.5 331.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 403.5 427.5 L 434.5 427.5 L 434.5 441.5 L 403.5 441.5 Z M 740.5 427.5 L 771.5 427.5 L 771.5 450.5 L 740.5 450.5 Z M 740.5 450.5 L 771.5 450.5 L 771.5 458.5 L 740.5 458.5 Z M 403.5 441.5 L 434.5 441.5 L 434.5 458.5 L 403.5 458.5 Z M 657.5 489.5 L 687.5 489.5 L 687.5 490.5 L 657.5 490.5 Z M 657.5 490.5 L 687.5 490.5 L 687.5 519.5 L 657.5 519.5 Z M 320.5 489.5 L 350.5 489.5 L 350.5 519.5 L 320.5 519.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.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="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;"/>
 </mask>
 </defs>
-<g id="surface374">
+<g id="surface403">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,5 @@
 <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 252 294 L 252 301 M 248 298 L 255 298 " 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 252 298 L 252 298 M 252 298 L 252 298 M 252 298 L 252 298 M 252 298 L 252 298 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.svg b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.svg
index 963338b..15f06ba 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.svg
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image451" 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="#image424"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image424"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1267.5 645.5 L 1301.5 645.5 L 1301.5 794.5 L 1267.5 794.5 Z M 842.5 711.5 L 877.5 711.5 L 877.5 794.5 L 842.5 794.5 Z M 941.5 711.5 L 976.5 711.5 L 976.5 794.5 L 941.5 794.5 Z M 309.5 698.5 L 343.5 698.5 L 343.5 794.5 L 309.5 794.5 Z M 1050.5 698.5 L 1085.5 698.5 L 1085.5 794.5 L 1050.5 794.5 Z M 405.5 698.5 L 440.5 698.5 L 440.5 794.5 L 405.5 794.5 Z M 621.5 698.5 L 656.5 698.5 L 656.5 794.5 L 621.5 794.5 Z M 718.5 698.5 L 753.5 698.5 L 753.5 794.5 L 718.5 794.5 Z M 1574.5 645.5 L 1608.5 645.5 L 1608.5 794.5 L 1574.5 794.5 Z M 1363.5 645.5 L 1398.5 645.5 L 1398.5 794.5 L 1363.5 794.5 Z M 1363.5 645.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1050.5 277.5 L 1085.5 277.5 L 1085.5 373.5 L 1050.5 373.5 Z M 968.5 277.5 L 1002.5 277.5 L 1002.5 373.5 L 968.5 373.5 Z M 828.5 277.5 L 863.5 277.5 L 863.5 373.5 L 828.5 373.5 Z M 621.5 277.5 L 656.5 277.5 L 656.5 424.5 L 621.5 424.5 Z M 718.5 277.5 L 753.5 277.5 L 753.5 424.5 L 718.5 424.5 Z M 405.5 284.5 L 440.5 284.5 L 440.5 431.5 L 405.5 431.5 Z M 309.5 284.5 L 343.5 284.5 L 343.5 431.5 L 309.5 431.5 Z M 1363.5 277.5 L 1398.5 277.5 L 1398.5 507.5 L 1363.5 507.5 Z M 1574.5 277.5 L 1608.5 277.5 L 1608.5 507.5 L 1574.5 507.5 Z M 1267.5 277.5 L 1301.5 277.5 L 1301.5 507.5 L 1267.5 507.5 Z M 1267.5 277.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image453"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 464.5 399.5 L 503.5 399.5 L 503.5 417.5 L 464.5 417.5 Z M 464.5 417.5 L 503.5 417.5 L 503.5 438.5 L 464.5 438.5 Z M 786.5 399.5 L 825.5 399.5 L 825.5 438.5 L 786.5 438.5 Z M 358.5 477.5 L 397.5 477.5 L 397.5 516.5 L 358.5 516.5 Z M 892.5 477.5 L 931.5 477.5 L 931.5 516.5 L 892.5 516.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image427"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface421">
+<g id="surface448">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -221,6 +221,5 @@
 <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 272 226 L 272 235 M 267 231 L 276 231 " 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 272 231 L 272 231 M 272 231 L 272 231 M 272 231 L 272 231 M 272 231 L 272 231 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.svg b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.svg
index 2ac8f8e..445290b 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.svg
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image395" 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="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1362.5 645.5 L 1397.5 645.5 L 1397.5 794.5 L 1362.5 794.5 Z M 827.5 711.5 L 862.5 711.5 L 862.5 794.5 L 827.5 794.5 Z M 940.5 711.5 L 975.5 711.5 L 975.5 794.5 L 940.5 794.5 Z M 309.5 698.5 L 343.5 698.5 L 343.5 794.5 L 309.5 794.5 Z M 718.5 698.5 L 753.5 698.5 L 753.5 794.5 L 718.5 794.5 Z M 1049.5 698.5 L 1084.5 698.5 L 1084.5 794.5 L 1049.5 794.5 Z M 405.5 698.5 L 440.5 698.5 L 440.5 794.5 L 405.5 794.5 Z M 621.5 698.5 L 656.5 698.5 L 656.5 794.5 L 621.5 794.5 Z M 1266.5 645.5 L 1300.5 645.5 L 1300.5 794.5 L 1266.5 794.5 Z M 1574.5 645.5 L 1608.5 645.5 L 1608.5 794.5 L 1574.5 794.5 Z M 1477.5 645.5 L 1512.5 645.5 L 1512.5 794.5 L 1477.5 794.5 Z M 1477.5 645.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1036.5 277.5 L 1070.5 277.5 L 1070.5 373.5 L 1036.5 373.5 Z M 925.5 277.5 L 960.5 277.5 L 960.5 373.5 L 925.5 373.5 Z M 828.5 277.5 L 863.5 277.5 L 863.5 373.5 L 828.5 373.5 Z M 718.5 277.5 L 753.5 277.5 L 753.5 424.5 L 718.5 424.5 Z M 621.5 277.5 L 656.5 277.5 L 656.5 424.5 L 621.5 424.5 Z M 405.5 284.5 L 440.5 284.5 L 440.5 431.5 L 405.5 431.5 Z M 309.5 284.5 L 343.5 284.5 L 343.5 431.5 L 309.5 431.5 Z M 1262.5 277.5 L 1297.5 277.5 L 1297.5 507.5 L 1262.5 507.5 Z M 1574.5 277.5 L 1608.5 277.5 L 1608.5 507.5 L 1574.5 507.5 Z M 1359.5 277.5 L 1393.5 277.5 L 1393.5 507.5 L 1359.5 507.5 Z M 1469.5 277.5 L 1504.5 277.5 L 1504.5 507.5 L 1469.5 507.5 Z M 1469.5 277.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 464.5 399.5 L 503.5 399.5 L 503.5 417.5 L 464.5 417.5 Z M 464.5 417.5 L 503.5 417.5 L 503.5 438.5 L 464.5 438.5 Z M 786.5 399.5 L 825.5 399.5 L 825.5 438.5 L 786.5 438.5 Z M 358.5 477.5 L 397.5 477.5 L 397.5 516.5 L 358.5 516.5 Z M 892.5 477.5 L 931.5 477.5 L 931.5 516.5 L 892.5 516.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface392">
+<g id="surface420">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <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 272 226 L 272 235 M 267 231 L 276 231 " 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 272 231 L 272 231 M 272 231 L 272 231 M 272 231 L 272 231 M 272 231 L 272 231 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.svg b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.svg
index c73f018..0d4dba0 100644
--- a/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.svg
+++ b/cells/dlrtn/sky130_fd_sc_hd__dlrtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image426" 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="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1501.5 631.5 L 1531.5 631.5 L 1531.5 763.5 L 1501.5 763.5 Z M 764.5 690.5 L 794.5 690.5 L 794.5 763.5 L 764.5 763.5 Z M 851.5 690.5 L 881.5 690.5 L 881.5 763.5 L 851.5 763.5 Z M 569.5 678.5 L 599.5 678.5 L 599.5 763.5 L 569.5 763.5 Z M 654.5 678.5 L 685.5 678.5 L 685.5 763.5 L 654.5 763.5 Z M 377.5 678.5 L 408.5 678.5 L 408.5 763.5 L 377.5 763.5 Z M 292.5 678.5 L 323.5 678.5 L 323.5 763.5 L 292.5 763.5 Z M 947.5 678.5 L 978.5 678.5 L 978.5 763.5 L 947.5 763.5 Z M 1138.5 631.5 L 1168.5 631.5 L 1168.5 763.5 L 1138.5 763.5 Z M 1223.5 631.5 L 1253.5 631.5 L 1253.5 763.5 L 1223.5 763.5 Z M 1320.5 631.5 L 1351.5 631.5 L 1351.5 763.5 L 1320.5 763.5 Z M 1413.5 631.5 L 1443.5 631.5 L 1443.5 763.5 L 1413.5 763.5 Z M 1594.5 631.5 L 1625.5 631.5 L 1625.5 763.5 L 1594.5 763.5 Z M 1594.5 631.5 "/>
 </clipPath>
-<image id="image399" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 947.5 307.5 L 978.5 307.5 L 978.5 392.5 L 947.5 392.5 Z M 874.5 307.5 L 905.5 307.5 L 905.5 392.5 L 874.5 392.5 Z M 752.5 307.5 L 782.5 307.5 L 782.5 392.5 L 752.5 392.5 Z M 654.5 307.5 L 685.5 307.5 L 685.5 437.5 L 654.5 437.5 Z M 569.5 307.5 L 599.5 307.5 L 599.5 437.5 L 569.5 437.5 Z M 377.5 313.5 L 408.5 313.5 L 408.5 443.5 L 377.5 443.5 Z M 292.5 313.5 L 323.5 313.5 L 323.5 443.5 L 292.5 443.5 Z M 1413.5 307.5 L 1443.5 307.5 L 1443.5 510.5 L 1413.5 510.5 Z M 1501.5 307.5 L 1531.5 307.5 L 1531.5 510.5 L 1501.5 510.5 Z M 1138.5 307.5 L 1168.5 307.5 L 1168.5 510.5 L 1138.5 510.5 Z M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 1320.5 307.5 L 1351.5 307.5 L 1351.5 510.5 L 1320.5 510.5 Z M 1223.5 307.5 L 1253.5 307.5 L 1253.5 510.5 L 1223.5 510.5 Z M 1223.5 307.5 "/>
 </clipPath>
-<image id="image400" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 429.5 414.5 L 464.5 414.5 L 464.5 431.5 L 429.5 431.5 Z M 429.5 431.5 L 464.5 431.5 L 464.5 449.5 L 429.5 449.5 Z M 714.5 414.5 L 749.5 414.5 L 749.5 449.5 L 714.5 449.5 Z M 336.5 483.5 L 370.5 483.5 L 370.5 518.5 L 336.5 518.5 Z M 807.5 483.5 L 842.5 483.5 L 842.5 518.5 L 807.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image401" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface395">
+<g id="surface423">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <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 243 285 L 277 285 M 243 251 L 277 251 M 243 251 L 243 285 M 277 251 L 277 285 " 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 243 285 L 277 285 M 243 251 L 277 251 M 277 285 L 277 251 M 243 285 L 243 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.svg b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.svg
index 4ffbee4..3743202 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.svg
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image382" 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="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1330.5 653.5 L 1367.5 653.5 L 1367.5 813.5 L 1330.5 813.5 Z M 655.5 710.5 L 692.5 710.5 L 692.5 813.5 L 655.5 813.5 Z M 423.5 710.5 L 460.5 710.5 L 460.5 813.5 L 423.5 813.5 Z M 319.5 710.5 L 356.5 710.5 L 356.5 813.5 L 319.5 813.5 Z M 1098.5 710.5 L 1135.5 710.5 L 1135.5 813.5 L 1098.5 813.5 Z M 991.5 710.5 L 1028.5 710.5 L 1028.5 813.5 L 991.5 813.5 Z M 885.5 710.5 L 922.5 710.5 L 922.5 813.5 L 885.5 813.5 Z M 758.5 710.5 L 795.5 710.5 L 795.5 813.5 L 758.5 813.5 Z M 1562.5 653.5 L 1599.5 653.5 L 1599.5 813.5 L 1562.5 813.5 Z M 1449.5 653.5 L 1486.5 653.5 L 1486.5 813.5 L 1449.5 813.5 Z M 1449.5 653.5 "/>
 </clipPath>
-<image id="image383" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1003.5 258.5 L 1040.5 258.5 L 1040.5 347.5 L 1003.5 347.5 Z M 875.5 258.5 L 912.5 258.5 L 912.5 347.5 L 875.5 347.5 Z M 1143.5 258.5 L 1180.5 258.5 L 1180.5 362.5 L 1143.5 362.5 Z M 655.5 258.5 L 692.5 258.5 L 692.5 416.5 L 655.5 416.5 Z M 758.5 258.5 L 795.5 258.5 L 795.5 416.5 L 758.5 416.5 Z M 423.5 266.5 L 460.5 266.5 L 460.5 423.5 L 423.5 423.5 Z M 319.5 266.5 L 356.5 266.5 L 356.5 423.5 L 319.5 423.5 Z M 1449.5 258.5 L 1486.5 258.5 L 1486.5 505.5 L 1449.5 505.5 Z M 1562.5 258.5 L 1599.5 258.5 L 1599.5 505.5 L 1562.5 505.5 Z M 1330.5 258.5 L 1367.5 258.5 L 1367.5 505.5 L 1330.5 505.5 Z M 1330.5 258.5 "/>
 </clipPath>
-<image id="image384" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 484.5 389.5 L 526.5 389.5 L 526.5 409.5 L 484.5 409.5 Z M 484.5 409.5 L 526.5 409.5 L 526.5 431.5 L 484.5 431.5 Z M 943.5 389.5 L 985.5 389.5 L 985.5 431.5 L 943.5 431.5 Z M 825.5 473.5 L 867.5 473.5 L 867.5 475.5 L 825.5 475.5 Z M 825.5 475.5 L 867.5 475.5 L 867.5 515.5 L 825.5 515.5 Z M 371.5 473.5 L 413.5 473.5 L 413.5 515.5 L 371.5 515.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image385" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface379">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <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 278 203 L 278 212 M 273 208 L 282 208 " 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 278 208 L 278 208 M 278 208 L 278 208 M 278 208 L 278 208 M 278 208 L 278 208 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.svg b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.svg
index a0c7895..6f6132b 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.svg
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image381" 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="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1373.5 645.5 L 1407.5 645.5 L 1407.5 794.5 L 1373.5 794.5 Z M 827.5 711.5 L 862.5 711.5 L 862.5 794.5 L 827.5 794.5 Z M 939.5 711.5 L 973.5 711.5 L 973.5 794.5 L 939.5 794.5 Z M 309.5 698.5 L 343.5 698.5 L 343.5 794.5 L 309.5 794.5 Z M 718.5 698.5 L 753.5 698.5 L 753.5 794.5 L 718.5 794.5 Z M 1048.5 698.5 L 1083.5 698.5 L 1083.5 794.5 L 1048.5 794.5 Z M 405.5 698.5 L 440.5 698.5 L 440.5 794.5 L 405.5 794.5 Z M 621.5 698.5 L 656.5 698.5 L 656.5 794.5 L 621.5 794.5 Z M 1264.5 645.5 L 1299.5 645.5 L 1299.5 794.5 L 1264.5 794.5 Z M 1574.5 645.5 L 1608.5 645.5 L 1608.5 794.5 L 1574.5 794.5 Z M 1477.5 645.5 L 1512.5 645.5 L 1512.5 794.5 L 1477.5 794.5 Z M 1477.5 645.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1036.5 277.5 L 1070.5 277.5 L 1070.5 373.5 L 1036.5 373.5 Z M 924.5 277.5 L 958.5 277.5 L 958.5 373.5 L 924.5 373.5 Z M 827.5 277.5 L 862.5 277.5 L 862.5 373.5 L 827.5 373.5 Z M 718.5 277.5 L 753.5 277.5 L 753.5 424.5 L 718.5 424.5 Z M 621.5 277.5 L 656.5 277.5 L 656.5 424.5 L 621.5 424.5 Z M 405.5 284.5 L 440.5 284.5 L 440.5 431.5 L 405.5 431.5 Z M 309.5 284.5 L 343.5 284.5 L 343.5 431.5 L 309.5 431.5 Z M 1264.5 277.5 L 1299.5 277.5 L 1299.5 507.5 L 1264.5 507.5 Z M 1574.5 277.5 L 1608.5 277.5 L 1608.5 507.5 L 1574.5 507.5 Z M 1373.5 277.5 L 1407.5 277.5 L 1407.5 507.5 L 1373.5 507.5 Z M 1469.5 277.5 L 1504.5 277.5 L 1504.5 507.5 L 1469.5 507.5 Z M 1469.5 277.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 464.5 399.5 L 503.5 399.5 L 503.5 417.5 L 464.5 417.5 Z M 464.5 417.5 L 503.5 417.5 L 503.5 438.5 L 464.5 438.5 Z M 891.5 399.5 L 930.5 399.5 L 930.5 438.5 L 891.5 438.5 Z M 781.5 477.5 L 820.5 477.5 L 820.5 479.5 L 781.5 479.5 Z M 781.5 479.5 L 820.5 479.5 L 820.5 516.5 L 781.5 516.5 Z M 358.5 477.5 L 397.5 477.5 L 397.5 516.5 L 358.5 516.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface378">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 252 250 L 291 250 M 252 211 L 291 211 M 252 211 L 252 250 M 291 211 L 291 250 " 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 252 250 L 291 250 M 252 211 L 291 211 M 291 250 L 291 211 M 252 250 L 252 211 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.svg b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.svg
index 2302e30..6fdf51a 100644
--- a/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.svg
+++ b/cells/dlrtp/sky130_fd_sc_hd__dlrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image414" 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="#image386"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1501.5 631.5 L 1531.5 631.5 L 1531.5 763.5 L 1501.5 763.5 Z M 764.5 690.5 L 794.5 690.5 L 794.5 763.5 L 764.5 763.5 Z M 851.5 690.5 L 881.5 690.5 L 881.5 763.5 L 851.5 763.5 Z M 569.5 678.5 L 599.5 678.5 L 599.5 763.5 L 569.5 763.5 Z M 654.5 678.5 L 685.5 678.5 L 685.5 763.5 L 654.5 763.5 Z M 377.5 678.5 L 408.5 678.5 L 408.5 763.5 L 377.5 763.5 Z M 292.5 678.5 L 323.5 678.5 L 323.5 763.5 L 292.5 763.5 Z M 947.5 678.5 L 978.5 678.5 L 978.5 763.5 L 947.5 763.5 Z M 1138.5 631.5 L 1168.5 631.5 L 1168.5 763.5 L 1138.5 763.5 Z M 1223.5 631.5 L 1253.5 631.5 L 1253.5 763.5 L 1223.5 763.5 Z M 1320.5 631.5 L 1351.5 631.5 L 1351.5 763.5 L 1320.5 763.5 Z M 1413.5 631.5 L 1443.5 631.5 L 1443.5 763.5 L 1413.5 763.5 Z M 1594.5 631.5 L 1625.5 631.5 L 1625.5 763.5 L 1594.5 763.5 Z M 1594.5 631.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 947.5 307.5 L 978.5 307.5 L 978.5 392.5 L 947.5 392.5 Z M 874.5 307.5 L 905.5 307.5 L 905.5 392.5 L 874.5 392.5 Z M 752.5 307.5 L 782.5 307.5 L 782.5 392.5 L 752.5 392.5 Z M 654.5 307.5 L 685.5 307.5 L 685.5 437.5 L 654.5 437.5 Z M 569.5 307.5 L 599.5 307.5 L 599.5 437.5 L 569.5 437.5 Z M 377.5 313.5 L 408.5 313.5 L 408.5 443.5 L 377.5 443.5 Z M 292.5 313.5 L 323.5 313.5 L 323.5 443.5 L 292.5 443.5 Z M 1413.5 307.5 L 1443.5 307.5 L 1443.5 510.5 L 1413.5 510.5 Z M 1501.5 307.5 L 1531.5 307.5 L 1531.5 510.5 L 1501.5 510.5 Z M 1138.5 307.5 L 1168.5 307.5 L 1168.5 510.5 L 1138.5 510.5 Z M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 1320.5 307.5 L 1351.5 307.5 L 1351.5 510.5 L 1320.5 510.5 Z M 1223.5 307.5 L 1253.5 307.5 L 1253.5 510.5 L 1223.5 510.5 Z M 1223.5 307.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 429.5 414.5 L 464.5 414.5 L 464.5 431.5 L 429.5 431.5 Z M 807.5 414.5 L 842.5 414.5 L 842.5 441.5 L 807.5 441.5 Z M 807.5 441.5 L 842.5 441.5 L 842.5 449.5 L 807.5 449.5 Z M 429.5 431.5 L 464.5 431.5 L 464.5 449.5 L 429.5 449.5 Z M 714.5 483.5 L 749.5 483.5 L 749.5 485.5 L 714.5 485.5 Z M 714.5 485.5 L 749.5 485.5 L 749.5 518.5 L 714.5 518.5 Z M 336.5 483.5 L 370.5 483.5 L 370.5 518.5 L 336.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface383">
+<g id="surface411">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -206,6 +206,5 @@
 <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 243 285 L 277 285 M 243 251 L 277 251 M 243 251 L 243 285 M 277 251 L 277 285 " 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 243 285 L 277 285 M 243 251 L 277 251 M 277 285 L 277 251 M 243 285 L 243 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.svg b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.svg
index 3ca5048..eb68e12 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.svg
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" 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="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 248.5 810.5 L 284.5 810.5 L 284.5 847.5 L 248.5 847.5 Z M 248.5 810.5 "/>
 </clipPath>
 <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="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1280.5 638.5 L 1312.5 638.5 L 1312.5 778.5 L 1280.5 778.5 Z M 787.5 700.5 L 819.5 700.5 L 819.5 778.5 L 787.5 778.5 Z M 885.5 700.5 L 917.5 700.5 L 917.5 778.5 L 885.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 391.5 687.5 L 423.5 687.5 L 423.5 778.5 L 391.5 778.5 Z M 987.5 687.5 L 1019.5 687.5 L 1019.5 778.5 L 987.5 778.5 Z M 1483.5 687.5 L 1515.5 687.5 L 1515.5 778.5 L 1483.5 778.5 Z M 594.5 687.5 L 626.5 687.5 L 626.5 778.5 L 594.5 778.5 Z M 684.5 687.5 L 716.5 687.5 L 716.5 778.5 L 684.5 778.5 Z M 1585.5 638.5 L 1617.5 638.5 L 1617.5 778.5 L 1585.5 778.5 Z M 1190.5 638.5 L 1222.5 638.5 L 1222.5 778.5 L 1190.5 778.5 Z M 1190.5 638.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 987.5 293.5 L 1019.5 293.5 L 1019.5 383.5 L 987.5 383.5 Z M 909.5 293.5 L 942.5 293.5 L 942.5 383.5 L 909.5 383.5 Z M 793.5 293.5 L 825.5 293.5 L 825.5 383.5 L 793.5 383.5 Z M 599.5 293.5 L 631.5 293.5 L 631.5 431.5 L 599.5 431.5 Z M 1483.5 293.5 L 1515.5 293.5 L 1515.5 431.5 L 1483.5 431.5 Z M 690.5 293.5 L 722.5 293.5 L 722.5 431.5 L 690.5 431.5 Z M 391.5 299.5 L 423.5 299.5 L 423.5 437.5 L 391.5 437.5 Z M 300.5 299.5 L 333.5 299.5 L 333.5 437.5 L 300.5 437.5 Z M 1190.5 293.5 L 1222.5 293.5 L 1222.5 508.5 L 1190.5 508.5 Z M 1585.5 293.5 L 1617.5 293.5 L 1617.5 508.5 L 1585.5 508.5 Z M 1280.5 293.5 L 1312.5 293.5 L 1312.5 508.5 L 1280.5 508.5 Z M 1280.5 293.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 446.5 407.5 L 483.5 407.5 L 483.5 424.5 L 446.5 424.5 Z M 446.5 424.5 L 483.5 424.5 L 483.5 444.5 L 446.5 444.5 Z M 753.5 407.5 L 790.5 407.5 L 790.5 444.5 L 753.5 444.5 Z M 347.5 480.5 L 383.5 480.5 L 383.5 517.5 L 347.5 517.5 Z M 852.5 480.5 L 889.5 480.5 L 889.5 517.5 L 852.5 517.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface425">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -209,6 +209,5 @@
 <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 266 246 L 266 255 M 261 251 L 270 251 " 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 266 251 L 266 251 M 266 251 L 266 251 M 266 251 L 266 251 M 266 251 L 266 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.svg b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.svg
index 3e38c4b..729b07f 100644
--- a/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.svg
+++ b/cells/dlxbn/sky130_fd_sc_hd__dlxbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image382" 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="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 238.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1521.5 626.5 L 1550.5 626.5 L 1550.5 750.5 L 1521.5 750.5 Z M 734.5 681.5 L 763.5 681.5 L 763.5 750.5 L 734.5 750.5 Z M 816.5 681.5 L 845.5 681.5 L 845.5 750.5 L 816.5 750.5 Z M 1430.5 670.5 L 1459.5 670.5 L 1459.5 750.5 L 1430.5 750.5 Z M 631.5 670.5 L 659.5 670.5 L 659.5 750.5 L 631.5 750.5 Z M 550.5 670.5 L 579.5 670.5 L 579.5 750.5 L 550.5 750.5 Z M 367.5 670.5 L 395.5 670.5 L 395.5 750.5 L 367.5 750.5 Z M 907.5 670.5 L 936.5 670.5 L 936.5 750.5 L 907.5 750.5 Z M 286.5 670.5 L 315.5 670.5 L 315.5 750.5 L 286.5 750.5 Z M 1087.5 626.5 L 1116.5 626.5 L 1116.5 750.5 L 1087.5 750.5 Z M 1251.5 626.5 L 1279.5 626.5 L 1279.5 750.5 L 1251.5 750.5 Z M 1170.5 626.5 L 1199.5 626.5 L 1199.5 750.5 L 1170.5 750.5 Z M 1603.5 626.5 L 1631.5 626.5 L 1631.5 750.5 L 1603.5 750.5 Z M 1603.5 626.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 907.5 320.5 L 936.5 320.5 L 936.5 400.5 L 907.5 400.5 Z M 838.5 320.5 L 867.5 320.5 L 867.5 400.5 L 838.5 400.5 Z M 723.5 320.5 L 751.5 320.5 L 751.5 400.5 L 723.5 400.5 Z M 631.5 320.5 L 659.5 320.5 L 659.5 442.5 L 631.5 442.5 Z M 550.5 320.5 L 579.5 320.5 L 579.5 442.5 L 550.5 442.5 Z M 1430.5 320.5 L 1459.5 320.5 L 1459.5 442.5 L 1430.5 442.5 Z M 286.5 325.5 L 315.5 325.5 L 315.5 448.5 L 286.5 448.5 Z M 367.5 325.5 L 395.5 325.5 L 395.5 448.5 L 367.5 448.5 Z M 1521.5 320.5 L 1550.5 320.5 L 1550.5 511.5 L 1521.5 511.5 Z M 1087.5 320.5 L 1116.5 320.5 L 1116.5 511.5 L 1087.5 511.5 Z M 1170.5 320.5 L 1199.5 320.5 L 1199.5 511.5 L 1170.5 511.5 Z M 1603.5 320.5 L 1631.5 320.5 L 1631.5 511.5 L 1603.5 511.5 Z M 1251.5 320.5 L 1279.5 320.5 L 1279.5 511.5 L 1251.5 511.5 Z M 1251.5 320.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 415.5 421.5 L 448.5 421.5 L 448.5 436.5 L 415.5 436.5 Z M 415.5 436.5 L 448.5 436.5 L 448.5 454.5 L 415.5 454.5 Z M 687.5 421.5 L 720.5 421.5 L 720.5 454.5 L 687.5 454.5 Z M 327.5 486.5 L 360.5 486.5 L 360.5 519.5 L 327.5 519.5 Z M 775.5 486.5 L 808.5 486.5 L 808.5 519.5 L 775.5 519.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface379">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,5 @@
 <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 238 300 L 271 300 M 238 268 L 271 268 M 238 268 L 238 300 M 271 268 L 271 300 " 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 238 300 L 271 300 M 238 268 L 271 268 M 271 300 L 271 268 M 238 300 L 238 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.svg b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.svg
index f0dc691..b040e1b 100644
--- a/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.svg
+++ b/cells/dlxbp/sky130_fd_sc_hd__dlxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 248.5 810.5 L 284.5 810.5 L 284.5 847.5 L 248.5 847.5 Z M 248.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1280.5 638.5 L 1312.5 638.5 L 1312.5 778.5 L 1280.5 778.5 Z M 787.5 700.5 L 819.5 700.5 L 819.5 778.5 L 787.5 778.5 Z M 885.5 700.5 L 917.5 700.5 L 917.5 778.5 L 885.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 391.5 687.5 L 423.5 687.5 L 423.5 778.5 L 391.5 778.5 Z M 987.5 687.5 L 1019.5 687.5 L 1019.5 778.5 L 987.5 778.5 Z M 1483.5 687.5 L 1515.5 687.5 L 1515.5 778.5 L 1483.5 778.5 Z M 594.5 687.5 L 626.5 687.5 L 626.5 778.5 L 594.5 778.5 Z M 684.5 687.5 L 716.5 687.5 L 716.5 778.5 L 684.5 778.5 Z M 1585.5 638.5 L 1617.5 638.5 L 1617.5 778.5 L 1585.5 778.5 Z M 1190.5 638.5 L 1222.5 638.5 L 1222.5 778.5 L 1190.5 778.5 Z M 1190.5 638.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 987.5 293.5 L 1019.5 293.5 L 1019.5 383.5 L 987.5 383.5 Z M 881.5 293.5 L 914.5 293.5 L 914.5 383.5 L 881.5 383.5 Z M 789.5 293.5 L 821.5 293.5 L 821.5 383.5 L 789.5 383.5 Z M 596.5 293.5 L 628.5 293.5 L 628.5 431.5 L 596.5 431.5 Z M 1483.5 293.5 L 1515.5 293.5 L 1515.5 431.5 L 1483.5 431.5 Z M 686.5 293.5 L 719.5 293.5 L 719.5 431.5 L 686.5 431.5 Z M 391.5 299.5 L 423.5 299.5 L 423.5 437.5 L 391.5 437.5 Z M 300.5 299.5 L 333.5 299.5 L 333.5 437.5 L 300.5 437.5 Z M 1190.5 293.5 L 1222.5 293.5 L 1222.5 508.5 L 1190.5 508.5 Z M 1585.5 293.5 L 1617.5 293.5 L 1617.5 508.5 L 1585.5 508.5 Z M 1280.5 293.5 L 1312.5 293.5 L 1312.5 508.5 L 1280.5 508.5 Z M 1280.5 293.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 446.5 407.5 L 483.5 407.5 L 483.5 424.5 L 446.5 424.5 Z M 854.5 407.5 L 891.5 407.5 L 891.5 434.5 L 854.5 434.5 Z M 854.5 434.5 L 891.5 434.5 L 891.5 444.5 L 854.5 444.5 Z M 446.5 424.5 L 483.5 424.5 L 483.5 444.5 L 446.5 444.5 Z M 766.5 480.5 L 803.5 480.5 L 803.5 482.5 L 766.5 482.5 Z M 766.5 482.5 L 803.5 482.5 L 803.5 517.5 L 766.5 517.5 Z M 347.5 480.5 L 383.5 480.5 L 383.5 517.5 L 347.5 517.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.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="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;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 266 246 L 266 255 M 261 251 L 270 251 " 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 266 251 L 266 251 M 266 251 L 266 251 M 266 251 L 266 251 M 266 251 L 266 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.svg b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.svg
index 314d4a0..1be6854 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.svg
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" 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="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1549.5 662.5 L 1589.5 662.5 L 1589.5 835.5 L 1549.5 835.5 Z M 931.5 739.5 L 970.5 739.5 L 970.5 835.5 L 931.5 835.5 Z M 1050.5 739.5 L 1090.5 739.5 L 1090.5 835.5 L 1050.5 835.5 Z M 1177.5 723.5 L 1217.5 723.5 L 1217.5 835.5 L 1177.5 835.5 Z M 443.5 723.5 L 482.5 723.5 L 482.5 835.5 L 443.5 835.5 Z M 693.5 723.5 L 732.5 723.5 L 732.5 835.5 L 693.5 835.5 Z M 804.5 723.5 L 844.5 723.5 L 844.5 835.5 L 804.5 835.5 Z M 331.5 723.5 L 371.5 723.5 L 371.5 835.5 L 331.5 835.5 Z M 1427.5 662.5 L 1467.5 662.5 L 1467.5 835.5 L 1427.5 835.5 Z M 1427.5 662.5 "/>
 </clipPath>
-<image id="image332" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1177.5 237.5 L 1217.5 237.5 L 1217.5 348.5 L 1177.5 348.5 Z M 931.5 237.5 L 970.5 237.5 L 970.5 348.5 L 931.5 348.5 Z M 1042.5 237.5 L 1082.5 237.5 L 1082.5 348.5 L 1042.5 348.5 Z M 804.5 237.5 L 844.5 237.5 L 844.5 407.5 L 804.5 407.5 Z M 693.5 237.5 L 732.5 237.5 L 732.5 407.5 L 693.5 407.5 Z M 331.5 245.5 L 371.5 245.5 L 371.5 415.5 L 331.5 415.5 Z M 443.5 245.5 L 482.5 245.5 L 482.5 415.5 L 443.5 415.5 Z M 1427.5 237.5 L 1467.5 237.5 L 1467.5 503.5 L 1427.5 503.5 Z M 1549.5 237.5 L 1589.5 237.5 L 1589.5 503.5 L 1549.5 503.5 Z M 1549.5 237.5 "/>
 </clipPath>
-<image id="image333" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 510.5 378.5 L 556.5 378.5 L 556.5 399.5 L 510.5 399.5 Z M 510.5 399.5 L 556.5 399.5 L 556.5 423.5 L 510.5 423.5 Z M 876.5 378.5 L 921.5 378.5 L 921.5 423.5 L 876.5 423.5 Z M 388.5 468.5 L 433.5 468.5 L 433.5 513.5 L 388.5 513.5 Z M 1010.5 468.5 L 1056.5 468.5 L 1056.5 513.5 L 1010.5 513.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image334" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <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 288 176 L 288 185 M 283 181 L 292 181 " 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 288 181 L 288 181 M 288 181 L 288 181 M 288 181 L 288 181 M 288 181 L 288 181 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.svg b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.svg
index b2ad94d..fe04633 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.svg
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1351.5 653.5 L 1388.5 653.5 L 1388.5 813.5 L 1351.5 813.5 Z M 896.5 724.5 L 933.5 724.5 L 933.5 813.5 L 896.5 813.5 Z M 1002.5 724.5 L 1039.5 724.5 L 1039.5 813.5 L 1002.5 813.5 Z M 319.5 710.5 L 356.5 710.5 L 356.5 813.5 L 319.5 813.5 Z M 1119.5 710.5 L 1156.5 710.5 L 1156.5 813.5 L 1119.5 813.5 Z M 423.5 710.5 L 460.5 710.5 L 460.5 813.5 L 423.5 813.5 Z M 659.5 710.5 L 696.5 710.5 L 696.5 813.5 L 659.5 813.5 Z M 763.5 710.5 L 800.5 710.5 L 800.5 813.5 L 763.5 813.5 Z M 1562.5 653.5 L 1599.5 653.5 L 1599.5 813.5 L 1562.5 813.5 Z M 1459.5 653.5 L 1496.5 653.5 L 1496.5 813.5 L 1459.5 813.5 Z M 1459.5 653.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1119.5 258.5 L 1156.5 258.5 L 1156.5 362.5 L 1119.5 362.5 Z M 1031.5 258.5 L 1068.5 258.5 L 1068.5 362.5 L 1031.5 362.5 Z M 881.5 258.5 L 918.5 258.5 L 918.5 362.5 L 881.5 362.5 Z M 659.5 258.5 L 696.5 258.5 L 696.5 416.5 L 659.5 416.5 Z M 763.5 258.5 L 800.5 258.5 L 800.5 416.5 L 763.5 416.5 Z M 423.5 266.5 L 460.5 266.5 L 460.5 423.5 L 423.5 423.5 Z M 319.5 266.5 L 356.5 266.5 L 356.5 423.5 L 319.5 423.5 Z M 1459.5 258.5 L 1496.5 258.5 L 1496.5 505.5 L 1459.5 505.5 Z M 1562.5 258.5 L 1599.5 258.5 L 1599.5 505.5 L 1562.5 505.5 Z M 1351.5 258.5 L 1388.5 258.5 L 1388.5 505.5 L 1351.5 505.5 Z M 1351.5 258.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 486.5 389.5 L 528.5 389.5 L 528.5 409.5 L 486.5 409.5 Z M 486.5 409.5 L 528.5 409.5 L 528.5 431.5 L 486.5 431.5 Z M 836.5 389.5 L 878.5 389.5 L 878.5 431.5 L 836.5 431.5 Z M 372.5 473.5 L 414.5 473.5 L 414.5 515.5 L 372.5 515.5 Z M 949.5 473.5 L 991.5 473.5 L 991.5 515.5 L 949.5 515.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.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="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;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 259 229 L 301 229 M 259 187 L 301 187 M 259 187 L 259 229 M 301 187 L 301 229 " 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 259 229 L 301 229 M 259 187 L 301 187 M 301 229 L 301 187 M 259 229 L 259 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.svg b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.svg
index 0c799fd..084f44b 100644
--- a/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.svg
+++ b/cells/dlxtn/sky130_fd_sc_hd__dlxtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 247.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1585.5 638.5 L 1617.5 638.5 L 1617.5 778.5 L 1585.5 778.5 Z M 893.5 700.5 L 926.5 700.5 L 926.5 778.5 L 893.5 778.5 Z M 801.5 700.5 L 833.5 700.5 L 833.5 778.5 L 801.5 778.5 Z M 391.5 687.5 L 423.5 687.5 L 423.5 778.5 L 391.5 778.5 Z M 594.5 687.5 L 626.5 687.5 L 626.5 778.5 L 594.5 778.5 Z M 684.5 687.5 L 716.5 687.5 L 716.5 778.5 L 684.5 778.5 Z M 996.5 687.5 L 1028.5 687.5 L 1028.5 778.5 L 996.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 1302.5 638.5 L 1334.5 638.5 L 1334.5 778.5 L 1302.5 778.5 Z M 1208.5 638.5 L 1240.5 638.5 L 1240.5 778.5 L 1208.5 778.5 Z M 1490.5 638.5 L 1523.5 638.5 L 1523.5 778.5 L 1490.5 778.5 Z M 1392.5 638.5 L 1425.5 638.5 L 1425.5 778.5 L 1392.5 778.5 Z M 1392.5 638.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 996.5 293.5 L 1028.5 293.5 L 1028.5 383.5 L 996.5 383.5 Z M 788.5 293.5 L 820.5 293.5 L 820.5 383.5 L 788.5 383.5 Z M 918.5 293.5 L 950.5 293.5 L 950.5 383.5 L 918.5 383.5 Z M 684.5 293.5 L 716.5 293.5 L 716.5 431.5 L 684.5 431.5 Z M 594.5 293.5 L 626.5 293.5 L 626.5 431.5 L 594.5 431.5 Z M 391.5 299.5 L 423.5 299.5 L 423.5 437.5 L 391.5 437.5 Z M 300.5 299.5 L 333.5 299.5 L 333.5 437.5 L 300.5 437.5 Z M 1302.5 293.5 L 1334.5 293.5 L 1334.5 508.5 L 1302.5 508.5 Z M 1208.5 293.5 L 1240.5 293.5 L 1240.5 508.5 L 1208.5 508.5 Z M 1392.5 293.5 L 1425.5 293.5 L 1425.5 508.5 L 1392.5 508.5 Z M 1585.5 293.5 L 1617.5 293.5 L 1617.5 508.5 L 1585.5 508.5 Z M 1490.5 293.5 L 1523.5 293.5 L 1523.5 508.5 L 1490.5 508.5 Z M 1490.5 293.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 446.5 407.5 L 483.5 407.5 L 483.5 424.5 L 446.5 424.5 Z M 446.5 424.5 L 483.5 424.5 L 483.5 444.5 L 446.5 444.5 Z M 748.5 407.5 L 784.5 407.5 L 784.5 444.5 L 748.5 444.5 Z M 347.5 480.5 L 383.5 480.5 L 383.5 517.5 L 347.5 517.5 Z M 847.5 480.5 L 884.5 480.5 L 884.5 517.5 L 847.5 517.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 247 269 L 283 269 M 247 232 L 283 232 M 247 232 L 247 269 M 283 232 L 283 269 " 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 247 269 L 283 269 M 247 232 L 283 232 M 283 269 L 283 232 M 247 269 L 247 232 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.svg b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.svg
index afba34b..0829da4 100644
--- a/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.svg
+++ b/cells/dlxtp/sky130_fd_sc_hd__dlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image346" 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="#image346"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <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="#image346"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1542.5 662.5 L 1582.5 662.5 L 1582.5 835.5 L 1542.5 835.5 Z M 931.5 739.5 L 970.5 739.5 L 970.5 835.5 L 931.5 835.5 Z M 1062.5 739.5 L 1102.5 739.5 L 1102.5 835.5 L 1062.5 835.5 Z M 1174.5 739.5 L 1214.5 739.5 L 1214.5 835.5 L 1174.5 835.5 Z M 443.5 723.5 L 482.5 723.5 L 482.5 835.5 L 443.5 835.5 Z M 693.5 723.5 L 732.5 723.5 L 732.5 835.5 L 693.5 835.5 Z M 804.5 723.5 L 844.5 723.5 L 844.5 835.5 L 804.5 835.5 Z M 331.5 723.5 L 371.5 723.5 L 371.5 835.5 L 331.5 835.5 Z M 1427.5 662.5 L 1467.5 662.5 L 1467.5 835.5 L 1427.5 835.5 Z M 1427.5 662.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image347"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1174.5 237.5 L 1214.5 237.5 L 1214.5 348.5 L 1174.5 348.5 Z M 931.5 237.5 L 970.5 237.5 L 970.5 348.5 L 931.5 348.5 Z M 1042.5 237.5 L 1082.5 237.5 L 1082.5 348.5 L 1042.5 348.5 Z M 804.5 237.5 L 844.5 237.5 L 844.5 407.5 L 804.5 407.5 Z M 693.5 237.5 L 732.5 237.5 L 732.5 407.5 L 693.5 407.5 Z M 331.5 245.5 L 371.5 245.5 L 371.5 415.5 L 331.5 415.5 Z M 443.5 245.5 L 482.5 245.5 L 482.5 415.5 L 443.5 415.5 Z M 1427.5 237.5 L 1467.5 237.5 L 1467.5 503.5 L 1427.5 503.5 Z M 1542.5 237.5 L 1582.5 237.5 L 1582.5 503.5 L 1542.5 503.5 Z M 1542.5 237.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 510.5 378.5 L 556.5 378.5 L 556.5 399.5 L 510.5 399.5 Z M 1005.5 378.5 L 1050.5 378.5 L 1050.5 412.5 L 1005.5 412.5 Z M 1005.5 412.5 L 1050.5 412.5 L 1050.5 423.5 L 1005.5 423.5 Z M 510.5 399.5 L 556.5 399.5 L 556.5 423.5 L 510.5 423.5 Z M 883.5 468.5 L 928.5 468.5 L 928.5 471.5 L 883.5 471.5 Z M 883.5 471.5 L 928.5 471.5 L 928.5 513.5 L 883.5 513.5 Z M 388.5 468.5 L 433.5 468.5 L 433.5 513.5 L 388.5 513.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image349"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface316">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 287 176 L 287 185 M 282 181 L 291 181 " 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 287 181 L 287 181 M 287 181 L 287 181 M 287 181 L 287 181 M 287 181 L 287 181 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.svg b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.svg
index 16795f7..4c2026f 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.svg
+++ b/cells/dlygate4sd1/sky130_fd_sc_hd__dlygate4sd1_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image282" 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="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1002.5 666.5 L 1043.5 666.5 L 1043.5 781.5 L 1002.5 781.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 745.5 729.5 L 786.5 729.5 L 786.5 844.5 L 745.5 844.5 Z M 1135.5 666.5 L 1176.5 666.5 L 1176.5 844.5 L 1135.5 844.5 Z M 1135.5 666.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 630.5 228.5 L 671.5 228.5 L 671.5 343.5 L 630.5 343.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 343.5 L 745.5 343.5 Z M 1005.5 327.5 L 1046.5 327.5 L 1046.5 442.5 L 1005.5 442.5 Z M 1135.5 228.5 L 1176.5 228.5 L 1176.5 502.5 L 1135.5 502.5 Z M 1135.5 228.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 560 194 L 607 194 M 560 148 L 607 148 M 560 148 L 560 194 M 607 148 L 607 194 " 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 560 194 L 607 194 M 560 148 L 607 148 M 607 194 L 607 148 M 560 194 L 560 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.svg b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.svg
index 62d79b0..1f2f329 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.svg
+++ b/cells/dlygate4sd2/sky130_fd_sc_hd__dlygate4sd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1178.5 666.5 L 1220.5 666.5 L 1220.5 844.5 L 1178.5 844.5 Z M 660.5 729.5 L 701.5 729.5 L 701.5 844.5 L 660.5 844.5 Z M 1040.5 729.5 L 1090.5 729.5 L 1090.5 844.5 L 1040.5 844.5 Z M 775.5 729.5 L 824.5 729.5 L 824.5 844.5 L 775.5 844.5 Z M 775.5 729.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1040.5 228.5 L 1090.5 228.5 L 1090.5 343.5 L 1040.5 343.5 Z M 660.5 228.5 L 701.5 228.5 L 701.5 343.5 L 660.5 343.5 Z M 775.5 228.5 L 824.5 228.5 L 824.5 343.5 L 775.5 343.5 Z M 1178.5 228.5 L 1220.5 228.5 L 1220.5 502.5 L 1178.5 502.5 Z M 1178.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 1317 706 L 1363 706 M 1317 659 L 1363 659 M 1317 659 L 1317 706 M 1363 659 L 1363 706 " 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 1317 706 L 1363 706 M 1317 659 L 1363 659 M 1363 706 L 1363 659 M 1317 706 L 1317 659 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.svg b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.svg
index fe43196..0876353 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.svg
+++ b/cells/dlygate4sd3/sky130_fd_sc_hd__dlygate4sd3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1289.5 666.5 L 1330.5 666.5 L 1330.5 844.5 L 1289.5 844.5 Z M 596.5 729.5 L 637.5 729.5 L 637.5 844.5 L 596.5 844.5 Z M 1064.5 729.5 L 1200.5 729.5 L 1200.5 844.5 L 1064.5 844.5 Z M 711.5 729.5 L 848.5 729.5 L 848.5 844.5 L 711.5 844.5 Z M 711.5 729.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1064.5 228.5 L 1200.5 228.5 L 1200.5 343.5 L 1064.5 343.5 Z M 596.5 228.5 L 637.5 228.5 L 637.5 343.5 L 596.5 343.5 Z M 711.5 228.5 L 848.5 228.5 L 848.5 343.5 L 711.5 343.5 Z M 1289.5 228.5 L 1330.5 228.5 L 1330.5 502.5 L 1289.5 502.5 Z M 1289.5 228.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.svg b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.svg
index 26788bf..f7da5e4 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.svg
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hd__dlymetal6s2s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 363.5 885.5 L 410.5 885.5 L 410.5 931.5 L 363.5 931.5 Z M 363.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1053.5 666.5 L 1094.5 666.5 L 1094.5 844.5 L 1053.5 844.5 Z M 923.5 729.5 L 964.5 729.5 L 964.5 844.5 L 923.5 844.5 Z M 1310.5 729.5 L 1351.5 729.5 L 1351.5 844.5 L 1310.5 844.5 Z M 486.5 729.5 L 527.5 729.5 L 527.5 844.5 L 486.5 844.5 Z M 1440.5 666.5 L 1481.5 666.5 L 1481.5 844.5 L 1440.5 844.5 Z M 616.5 666.5 L 657.5 666.5 L 657.5 844.5 L 616.5 844.5 Z M 616.5 666.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1310.5 228.5 L 1351.5 228.5 L 1351.5 343.5 L 1310.5 343.5 Z M 923.5 228.5 L 964.5 228.5 L 964.5 343.5 L 923.5 343.5 Z M 486.5 228.5 L 527.5 228.5 L 527.5 343.5 L 486.5 343.5 Z M 1440.5 228.5 L 1481.5 228.5 L 1481.5 502.5 L 1440.5 502.5 Z M 616.5 228.5 L 657.5 228.5 L 657.5 502.5 L 616.5 502.5 Z M 1053.5 228.5 L 1094.5 228.5 L 1094.5 502.5 L 1053.5 502.5 Z M 1053.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 867 613 L 913 613 M 867 566 L 913 566 M 867 566 L 867 613 M 913 566 L 913 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 867 613 L 913 613 M 867 566 L 913 566 M 913 613 L 913 566 M 867 613 L 867 566 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.svg b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.svg
index 195e9c0..eaf8cc9 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.svg
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hd__dlymetal6s4s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 363.5 885.5 L 410.5 885.5 L 410.5 931.5 L 363.5 931.5 Z M 363.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1003.5 666.5 L 1044.5 666.5 L 1044.5 844.5 L 1003.5 844.5 Z M 873.5 729.5 L 915.5 729.5 L 915.5 844.5 L 873.5 844.5 Z M 1310.5 729.5 L 1351.5 729.5 L 1351.5 844.5 L 1310.5 844.5 Z M 486.5 729.5 L 527.5 729.5 L 527.5 844.5 L 486.5 844.5 Z M 1440.5 666.5 L 1481.5 666.5 L 1481.5 844.5 L 1440.5 844.5 Z M 616.5 666.5 L 657.5 666.5 L 657.5 844.5 L 616.5 844.5 Z M 616.5 666.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1310.5 228.5 L 1351.5 228.5 L 1351.5 343.5 L 1310.5 343.5 Z M 873.5 228.5 L 915.5 228.5 L 915.5 343.5 L 873.5 343.5 Z M 486.5 228.5 L 527.5 228.5 L 527.5 343.5 L 486.5 343.5 Z M 1440.5 228.5 L 1481.5 228.5 L 1481.5 502.5 L 1440.5 502.5 Z M 616.5 228.5 L 657.5 228.5 L 657.5 502.5 L 616.5 502.5 Z M 1003.5 228.5 L 1044.5 228.5 L 1044.5 502.5 L 1003.5 502.5 Z M 1003.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 1250 613 L 1296 613 M 1250 566 L 1296 566 M 1250 566 L 1250 613 M 1296 566 L 1296 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1250 613 L 1296 613 M 1250 566 L 1296 566 M 1296 613 L 1296 566 M 1250 613 L 1250 566 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.svg b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.svg
index e6641bd..3c65f17 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.svg
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hd__dlymetal6s6s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 365.5 885.5 L 411.5 885.5 L 411.5 931.5 L 365.5 931.5 Z M 365.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1005.5 666.5 L 1046.5 666.5 L 1046.5 844.5 L 1005.5 844.5 Z M 875.5 729.5 L 916.5 729.5 L 916.5 844.5 L 875.5 844.5 Z M 1262.5 729.5 L 1303.5 729.5 L 1303.5 844.5 L 1262.5 844.5 Z M 488.5 729.5 L 529.5 729.5 L 529.5 844.5 L 488.5 844.5 Z M 1392.5 666.5 L 1433.5 666.5 L 1433.5 844.5 L 1392.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 618.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1262.5 228.5 L 1303.5 228.5 L 1303.5 343.5 L 1262.5 343.5 Z M 875.5 228.5 L 916.5 228.5 L 916.5 343.5 L 875.5 343.5 Z M 488.5 228.5 L 529.5 228.5 L 529.5 343.5 L 488.5 343.5 Z M 1392.5 228.5 L 1433.5 228.5 L 1433.5 502.5 L 1392.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 1005.5 228.5 L 1046.5 228.5 L 1046.5 502.5 L 1005.5 502.5 Z M 1005.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 1508 334 L 1555 334 M 1508 287 L 1555 287 M 1508 287 L 1508 334 M 1555 287 L 1555 334 " 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 1508 334 L 1555 334 M 1508 287 L 1555 287 M 1555 334 L 1555 287 M 1508 334 L 1508 287 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.svg b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.svg
index 3813d2c..3716526 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_1.svg
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 704.5 666.5 L 745.5 666.5 L 745.5 781.5 L 704.5 781.5 Z M 566.5 729.5 L 607.5 729.5 L 607.5 844.5 L 566.5 844.5 Z M 1143.5 666.5 L 1184.5 666.5 L 1184.5 844.5 L 1143.5 844.5 Z M 1241.5 666.5 L 1282.5 666.5 L 1282.5 844.5 L 1241.5 844.5 Z M 1241.5 666.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 681.5 228.5 L 722.5 228.5 L 722.5 403.5 L 681.5 403.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 403.5 L 566.5 403.5 Z M 1241.5 228.5 L 1282.5 228.5 L 1282.5 502.5 L 1241.5 502.5 Z M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 941.5 228.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,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 564.9375 925.402344 L 564.9375 890.640625 L 578.335938 890.640625 L 580.433594 890.785156 L 582.390625 891.164062 L 584.203125 891.832031 L 585.871094 892.691406 L 587.347656 893.882812 L 588.730469 895.265625 L 589.875 896.933594 L 590.828125 898.746094 L 591.542969 900.796875 L 592.070312 902.992188 L 592.355469 905.421875 L 592.5 907.996094 L 592.355469 910.714844 L 592.023438 913.242188 L 591.449219 915.53125 L 590.6875 917.628906 L 589.683594 919.488281 L 588.445312 921.113281 L 587.109375 922.445312 L 585.632812 923.496094 L 584.011719 924.355469 L 582.246094 924.925781 L 580.339844 925.308594 L 578.335938 925.402344 Z M 569.371094 921.492188 L 577.574219 921.492188 L 579.765625 921.351562 L 581.722656 920.824219 L 583.4375 919.917969 L 584.867188 918.726562 L 586.011719 917.105469 L 586.96875 915.152344 L 587.253906 914.148438 L 587.539062 913.101562 L 587.777344 911.957031 L 587.921875 910.714844 L 588.015625 909.429688 L 588.0625 908.046875 L 587.875 904.945312 L 587.394531 902.226562 L 586.539062 899.890625 L 585.394531 898.03125 L 583.914062 896.503906 L 582.101562 895.410156 L 581.433594 895.171875 L 580.71875 894.933594 L 579.195312 894.644531 L 578.382812 894.597656 L 577.574219 894.550781 L 569.371094 894.550781 Z M 569.371094 921.492188 "/>
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.svg b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.svg
index af1af6a..eee238f 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_2.svg
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 646.5 729.5 L 687.5 729.5 L 687.5 844.5 L 646.5 844.5 Z M 503.5 729.5 L 544.5 729.5 L 544.5 844.5 L 503.5 844.5 Z M 1117.5 666.5 L 1158.5 666.5 L 1158.5 844.5 L 1117.5 844.5 Z M 1002.5 666.5 L 1043.5 666.5 L 1043.5 844.5 L 1002.5 844.5 Z M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 1378.5 666.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 646.5 228.5 L 687.5 228.5 L 687.5 403.5 L 646.5 403.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 403.5 L 503.5 403.5 Z M 904.5 228.5 L 945.5 228.5 L 945.5 485.5 L 904.5 485.5 Z M 1018.5 228.5 L 1060.5 228.5 L 1060.5 485.5 L 1018.5 485.5 Z M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 1319.5 559.5 L 1366.5 559.5 L 1366.5 568.5 L 1319.5 568.5 Z M 1319.5 568.5 L 1366.5 568.5 L 1366.5 606.5 L 1319.5 606.5 Z M 436.5 559.5 L 482.5 559.5 L 482.5 606.5 L 436.5 606.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.svg b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.svg
index 52a2eb9..90a6793 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_4.svg
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" 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="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1525.5 653.5 L 1562.5 653.5 L 1562.5 813.5 L 1525.5 813.5 Z M 319.5 653.5 L 356.5 653.5 L 356.5 813.5 L 319.5 813.5 Z M 449.5 653.5 L 486.5 653.5 L 486.5 813.5 L 449.5 813.5 Z M 770.5 653.5 L 807.5 653.5 L 807.5 813.5 L 770.5 813.5 Z M 874.5 653.5 L 911.5 653.5 L 911.5 813.5 L 874.5 813.5 Z M 978.5 653.5 L 1015.5 653.5 L 1015.5 813.5 L 978.5 813.5 Z M 1081.5 653.5 L 1118.5 653.5 L 1118.5 813.5 L 1081.5 813.5 Z M 1214.5 653.5 L 1251.5 653.5 L 1251.5 813.5 L 1214.5 813.5 Z M 1318.5 653.5 L 1355.5 653.5 L 1355.5 813.5 L 1318.5 813.5 Z M 1422.5 653.5 L 1459.5 653.5 L 1459.5 813.5 L 1422.5 813.5 Z M 1422.5 653.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 991.5 258.5 L 1028.5 258.5 L 1028.5 490.5 L 991.5 490.5 Z M 680.5 258.5 L 717.5 258.5 L 717.5 490.5 L 680.5 490.5 Z M 888.5 258.5 L 925.5 258.5 L 925.5 490.5 L 888.5 490.5 Z M 784.5 258.5 L 821.5 258.5 L 821.5 490.5 L 784.5 490.5 Z M 449.5 258.5 L 486.5 258.5 L 486.5 505.5 L 449.5 505.5 Z M 1318.5 258.5 L 1355.5 258.5 L 1355.5 505.5 L 1318.5 505.5 Z M 1422.5 258.5 L 1459.5 258.5 L 1459.5 505.5 L 1422.5 505.5 Z M 1525.5 258.5 L 1562.5 258.5 L 1562.5 505.5 L 1525.5 505.5 Z M 1214.5 258.5 L 1251.5 258.5 L 1251.5 505.5 L 1214.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 319.5 258.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 1285.5 557.5 L 1327.5 557.5 L 1327.5 564.5 L 1285.5 564.5 Z M 1285.5 564.5 L 1327.5 564.5 L 1327.5 599.5 L 1285.5 599.5 Z M 259.5 557.5 L 301.5 557.5 L 301.5 599.5 L 259.5 599.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.svg b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.svg
index cd573a2..c07cbf6 100644
--- a/cells/ebufn/sky130_fd_sc_hd__ebufn_8.svg
+++ b/cells/ebufn/sky130_fd_sc_hd__ebufn_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image376" 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="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <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="#image376"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1626.5 609.5 L 1649.5 609.5 L 1649.5 710.5 L 1626.5 710.5 Z M 271.5 609.5 L 294.5 609.5 L 294.5 710.5 L 271.5 710.5 Z M 336.5 609.5 L 360.5 609.5 L 360.5 710.5 L 336.5 710.5 Z M 415.5 609.5 L 439.5 609.5 L 439.5 710.5 L 415.5 710.5 Z M 600.5 609.5 L 623.5 609.5 L 623.5 710.5 L 600.5 710.5 Z M 666.5 609.5 L 689.5 609.5 L 689.5 710.5 L 666.5 710.5 Z M 731.5 609.5 L 755.5 609.5 L 755.5 710.5 L 731.5 710.5 Z M 797.5 609.5 L 820.5 609.5 L 820.5 710.5 L 797.5 710.5 Z M 863.5 609.5 L 886.5 609.5 L 886.5 710.5 L 863.5 710.5 Z M 928.5 609.5 L 952.5 609.5 L 952.5 710.5 L 928.5 710.5 Z M 994.5 609.5 L 1017.5 609.5 L 1017.5 710.5 L 994.5 710.5 Z M 1060.5 609.5 L 1083.5 609.5 L 1083.5 710.5 L 1060.5 710.5 Z M 1166.5 609.5 L 1189.5 609.5 L 1189.5 710.5 L 1166.5 710.5 Z M 1232.5 609.5 L 1255.5 609.5 L 1255.5 710.5 L 1232.5 710.5 Z M 1297.5 609.5 L 1321.5 609.5 L 1321.5 710.5 L 1297.5 710.5 Z M 1363.5 609.5 L 1386.5 609.5 L 1386.5 710.5 L 1363.5 710.5 Z M 1429.5 609.5 L 1452.5 609.5 L 1452.5 710.5 L 1429.5 710.5 Z M 1494.5 609.5 L 1518.5 609.5 L 1518.5 710.5 L 1494.5 710.5 Z M 1560.5 609.5 L 1583.5 609.5 L 1583.5 710.5 L 1560.5 710.5 Z M 1560.5 609.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image377"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1022.5 358.5 L 1045.5 358.5 L 1045.5 505.5 L 1022.5 505.5 Z M 956.5 358.5 L 980.5 358.5 L 980.5 505.5 L 956.5 505.5 Z M 562.5 358.5 L 586.5 358.5 L 586.5 505.5 L 562.5 505.5 Z M 891.5 358.5 L 914.5 358.5 L 914.5 505.5 L 891.5 505.5 Z M 825.5 358.5 L 848.5 358.5 L 848.5 505.5 L 825.5 505.5 Z M 628.5 358.5 L 651.5 358.5 L 651.5 505.5 L 628.5 505.5 Z M 759.5 358.5 L 783.5 358.5 L 783.5 505.5 L 759.5 505.5 Z M 694.5 358.5 L 717.5 358.5 L 717.5 505.5 L 694.5 505.5 Z M 1297.5 358.5 L 1321.5 358.5 L 1321.5 515.5 L 1297.5 515.5 Z M 1626.5 358.5 L 1649.5 358.5 L 1649.5 515.5 L 1626.5 515.5 Z M 1363.5 358.5 L 1386.5 358.5 L 1386.5 515.5 L 1363.5 515.5 Z M 1429.5 358.5 L 1452.5 358.5 L 1452.5 515.5 L 1429.5 515.5 Z M 1560.5 358.5 L 1583.5 358.5 L 1583.5 515.5 L 1560.5 515.5 Z M 1232.5 358.5 L 1255.5 358.5 L 1255.5 515.5 L 1232.5 515.5 Z M 1166.5 358.5 L 1189.5 358.5 L 1189.5 515.5 L 1166.5 515.5 Z M 336.5 358.5 L 360.5 358.5 L 360.5 515.5 L 336.5 515.5 Z M 271.5 358.5 L 294.5 358.5 L 294.5 515.5 L 271.5 515.5 Z M 1494.5 358.5 L 1518.5 358.5 L 1518.5 515.5 L 1494.5 515.5 Z M 415.5 358.5 L 439.5 358.5 L 439.5 515.5 L 415.5 515.5 Z M 415.5 358.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 1232.5 548.5 L 1259.5 548.5 L 1259.5 552.5 L 1232.5 552.5 Z M 1232.5 552.5 L 1259.5 552.5 L 1259.5 574.5 L 1232.5 574.5 Z M 298.5 548.5 L 325.5 548.5 L 325.5 574.5 L 298.5 574.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface344">
+<g id="surface373">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <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 226 771 L 253 771 M 226 744 L 253 744 M 226 744 L 226 771 M 253 744 L 253 771 " 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 226 771 L 253 771 M 226 744 L 253 744 M 253 771 L 253 744 M 226 771 L 226 744 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.svg b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.svg
index caf07a9..23462c6 100644
--- a/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.svg
+++ b/cells/edfxbp/sky130_fd_sc_hd__edfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 541.5 L 174.5 541.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image515" 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="#image487"/>
+  <use xlink:href="#image515"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 217.5 696.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1609.5 594.5 L 1629.5 594.5 L 1629.5 677.5 L 1609.5 677.5 Z M 1271.5 631.5 L 1290.5 631.5 L 1290.5 677.5 L 1271.5 677.5 Z M 879.5 631.5 L 898.5 631.5 L 898.5 677.5 L 879.5 677.5 Z M 823.5 631.5 L 842.5 631.5 L 842.5 677.5 L 823.5 677.5 Z M 1204.5 631.5 L 1223.5 631.5 L 1223.5 677.5 L 1204.5 677.5 Z M 587.5 624.5 L 606.5 624.5 L 606.5 677.5 L 587.5 677.5 Z M 1332.5 624.5 L 1351.5 624.5 L 1351.5 677.5 L 1332.5 677.5 Z M 1142.5 624.5 L 1161.5 624.5 L 1161.5 677.5 L 1142.5 677.5 Z M 708.5 624.5 L 727.5 624.5 L 727.5 677.5 L 708.5 677.5 Z M 947.5 624.5 L 966.5 624.5 L 966.5 677.5 L 947.5 677.5 Z M 1548.5 624.5 L 1567.5 624.5 L 1567.5 677.5 L 1548.5 677.5 Z M 421.5 624.5 L 441.5 624.5 L 441.5 677.5 L 421.5 677.5 Z M 467.5 624.5 L 486.5 624.5 L 486.5 677.5 L 467.5 677.5 Z M 643.5 624.5 L 662.5 624.5 L 662.5 677.5 L 643.5 677.5 Z M 249.5 624.5 L 268.5 624.5 L 268.5 677.5 L 249.5 677.5 Z M 302.5 624.5 L 321.5 624.5 L 321.5 677.5 L 302.5 677.5 Z M 1022.5 596.5 L 1042.5 596.5 L 1042.5 677.5 L 1022.5 677.5 Z M 1393.5 594.5 L 1412.5 594.5 L 1412.5 677.5 L 1393.5 677.5 Z M 1393.5 594.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1317.5 391.5 L 1336.5 391.5 L 1336.5 444.5 L 1317.5 444.5 Z M 1244.5 391.5 L 1263.5 391.5 L 1263.5 444.5 L 1244.5 444.5 Z M 930.5 391.5 L 949.5 391.5 L 949.5 444.5 L 930.5 444.5 Z M 864.5 391.5 L 883.5 391.5 L 883.5 444.5 L 864.5 444.5 Z M 806.5 391.5 L 825.5 391.5 L 825.5 444.5 L 806.5 444.5 Z M 1191.5 391.5 L 1210.5 391.5 L 1210.5 444.5 L 1191.5 444.5 Z M 1133.5 391.5 L 1152.5 391.5 L 1152.5 444.5 L 1133.5 444.5 Z M 467.5 391.5 L 486.5 391.5 L 486.5 472.5 L 467.5 472.5 Z M 421.5 391.5 L 441.5 391.5 L 441.5 472.5 L 421.5 472.5 Z M 1548.5 391.5 L 1567.5 391.5 L 1567.5 472.5 L 1548.5 472.5 Z M 643.5 391.5 L 662.5 391.5 L 662.5 472.5 L 643.5 472.5 Z M 708.5 391.5 L 727.5 391.5 L 727.5 472.5 L 708.5 472.5 Z M 587.5 391.5 L 606.5 391.5 L 606.5 472.5 L 587.5 472.5 Z M 302.5 395.5 L 321.5 395.5 L 321.5 476.5 L 302.5 476.5 Z M 249.5 395.5 L 268.5 395.5 L 268.5 476.5 L 249.5 476.5 Z M 1014.5 391.5 L 1033.5 391.5 L 1033.5 486.5 L 1014.5 486.5 Z M 1379.5 391.5 L 1398.5 391.5 L 1398.5 518.5 L 1379.5 518.5 Z M 1609.5 391.5 L 1629.5 391.5 L 1629.5 518.5 L 1609.5 518.5 Z M 1609.5 391.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 1461.5 458.5 L 1483.5 458.5 L 1483.5 475.5 L 1461.5 475.5 Z M 861.5 458.5 L 883.5 458.5 L 883.5 475.5 L 861.5 475.5 Z M 861.5 475.5 L 883.5 475.5 L 883.5 480.5 L 861.5 480.5 Z M 1302.5 458.5 L 1324.5 458.5 L 1324.5 480.5 L 1302.5 480.5 Z M 1190.5 458.5 L 1212.5 458.5 L 1212.5 480.5 L 1190.5 480.5 Z M 1461.5 475.5 L 1483.5 475.5 L 1483.5 480.5 L 1461.5 480.5 Z M 279.5 458.5 L 301.5 458.5 L 301.5 480.5 L 279.5 480.5 Z M 809.5 501.5 L 830.5 501.5 L 830.5 523.5 L 809.5 523.5 Z M 1244.5 501.5 L 1265.5 501.5 L 1265.5 523.5 L 1244.5 523.5 Z M 327.5 501.5 L 349.5 501.5 L 349.5 523.5 L 327.5 523.5 Z M 682.5 588.5 L 704.5 588.5 L 704.5 610.5 L 682.5 610.5 Z M 1520.5 588.5 L 1541.5 588.5 L 1541.5 610.5 L 1520.5 610.5 Z M 731.5 631.5 L 752.5 631.5 L 752.5 639.5 L 731.5 639.5 Z M 731.5 639.5 L 752.5 639.5 L 752.5 653.5 L 731.5 653.5 Z M 371.5 631.5 L 392.5 631.5 L 392.5 653.5 L 371.5 653.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface484">
+<g id="surface512">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -224,6 +224,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 248.785156 711.125 L 248.742188 711.796875 L 248.640625 712.40625 L 248.449219 712.976562 L 248.195312 713.480469 L 247.859375 713.964844 L 247.460938 714.386719 L 247.019531 714.742188 L 246.554688 715.015625 L 246.03125 715.226562 L 245.484375 715.394531 L 244.894531 715.480469 L 244.261719 715.5 L 237.339844 715.5 L 237.339844 700.164062 L 243.570312 700.164062 L 244.472656 700.226562 L 245.273438 700.375 L 245.988281 700.625 L 246.597656 700.984375 L 247.125 701.445312 L 247.542969 702.015625 L 247.714844 702.332031 L 247.859375 702.667969 L 247.964844 702.984375 L 248.050781 703.339844 L 248.09375 703.699219 L 248.113281 704.054688 L 248.050781 704.8125 L 247.859375 705.464844 L 247.566406 706.074219 L 247.144531 706.578125 L 246.621094 707.042969 L 245.988281 707.402344 L 246.597656 707.675781 L 247.125 707.96875 L 247.585938 708.304688 L 247.964844 708.683594 L 248.261719 709.082031 L 248.492188 709.503906 L 248.574219 709.757812 L 248.640625 710.007812 L 248.703125 710.261719 L 248.742188 710.554688 L 248.765625 710.828125 Z M 246.15625 704.328125 L 246.09375 703.699219 L 245.902344 703.171875 L 245.609375 702.707031 L 245.1875 702.371094 L 244.664062 702.121094 L 244.011719 701.953125 L 243.863281 701.953125 L 243.714844 701.929688 L 243.570312 701.910156 L 243.230469 701.910156 L 243.085938 701.886719 L 239.296875 701.886719 L 239.296875 706.769531 L 243.085938 706.769531 L 243.863281 706.726562 L 244.535156 706.601562 L 245.105469 706.371094 L 245.523438 706.054688 L 245.863281 705.632812 L 246.070312 705.128906 L 246.09375 705.023438 L 246.113281 704.898438 L 246.136719 704.769531 L 246.136719 704.476562 Z M 244.074219 713.773438 L 244.664062 713.753906 L 245.1875 713.628906 L 245.652344 713.417969 L 246.03125 713.144531 L 246.347656 712.785156 L 246.597656 712.34375 L 246.660156 712.175781 L 246.703125 711.988281 L 246.765625 711.777344 L 246.789062 711.585938 L 246.808594 711.375 L 246.828125 711.144531 L 246.789062 710.683594 L 246.703125 710.242188 L 246.554688 709.863281 L 246.347656 709.503906 L 246.070312 709.210938 L 245.757812 708.9375 L 245.523438 708.808594 L 245.273438 708.703125 L 245 708.621094 L 244.703125 708.558594 L 244.390625 708.515625 L 244.074219 708.496094 L 239.296875 708.496094 L 239.296875 713.773438 Z M 244.074219 713.773438 "/>
 <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 228 368 L 228 375 M 224 372 L 231 372 " 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 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 M 228 372 L 228 372 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.svg b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.svg
index 52f0545..ee0bf29 100644
--- a/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.svg
+++ b/cells/edfxtp/sky130_fd_sc_hd__edfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image499" 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="#image472"/>
+  <use xlink:href="#image499"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image472"/>
+  <use xlink:href="#image499"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1621.5 599.5 L 1641.5 599.5 L 1641.5 689.5 L 1621.5 689.5 Z M 936.5 639.5 L 957.5 639.5 L 957.5 689.5 L 936.5 689.5 Z M 876.5 639.5 L 896.5 639.5 L 896.5 689.5 L 876.5 689.5 Z M 1287.5 639.5 L 1307.5 639.5 L 1307.5 689.5 L 1287.5 689.5 Z M 1359.5 639.5 L 1380.5 639.5 L 1380.5 689.5 L 1359.5 689.5 Z M 1425.5 631.5 L 1445.5 631.5 L 1445.5 689.5 L 1425.5 689.5 Z M 1220.5 631.5 L 1241.5 631.5 L 1241.5 689.5 L 1220.5 689.5 Z M 442.5 631.5 L 462.5 631.5 L 462.5 689.5 L 442.5 689.5 Z M 1009.5 631.5 L 1030.5 631.5 L 1030.5 689.5 L 1009.5 689.5 Z M 491.5 631.5 L 512.5 631.5 L 512.5 689.5 L 491.5 689.5 Z M 1554.5 631.5 L 1575.5 631.5 L 1575.5 689.5 L 1554.5 689.5 Z M 751.5 631.5 L 771.5 631.5 L 771.5 689.5 L 751.5 689.5 Z M 681.5 631.5 L 701.5 631.5 L 701.5 689.5 L 681.5 689.5 Z M 620.5 631.5 L 641.5 631.5 L 641.5 689.5 L 620.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 1091.5 601.5 L 1111.5 601.5 L 1111.5 689.5 L 1091.5 689.5 Z M 1091.5 601.5 "/>
 </clipPath>
-<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image500" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image473"/>
+  <use xlink:href="#image500"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1409.5 379.5 L 1430.5 379.5 L 1430.5 437.5 L 1409.5 437.5 Z M 1331.5 379.5 L 1351.5 379.5 L 1351.5 437.5 L 1331.5 437.5 Z M 991.5 379.5 L 1011.5 379.5 L 1011.5 437.5 L 991.5 437.5 Z M 920.5 379.5 L 940.5 379.5 L 940.5 437.5 L 920.5 437.5 Z M 1273.5 379.5 L 1294.5 379.5 L 1294.5 437.5 L 1273.5 437.5 Z M 857.5 379.5 L 878.5 379.5 L 878.5 437.5 L 857.5 437.5 Z M 1210.5 379.5 L 1231.5 379.5 L 1231.5 437.5 L 1210.5 437.5 Z M 751.5 379.5 L 771.5 379.5 L 771.5 467.5 L 751.5 467.5 Z M 620.5 379.5 L 641.5 379.5 L 641.5 467.5 L 620.5 467.5 Z M 442.5 379.5 L 462.5 379.5 L 462.5 467.5 L 442.5 467.5 Z M 681.5 379.5 L 701.5 379.5 L 701.5 467.5 L 681.5 467.5 Z M 491.5 379.5 L 512.5 379.5 L 512.5 467.5 L 491.5 467.5 Z M 1554.5 379.5 L 1575.5 379.5 L 1575.5 467.5 L 1554.5 467.5 Z M 255.5 384.5 L 275.5 384.5 L 275.5 472.5 L 255.5 472.5 Z M 312.5 384.5 L 333.5 384.5 L 333.5 472.5 L 312.5 472.5 Z M 1081.5 379.5 L 1102.5 379.5 L 1102.5 483.5 L 1081.5 483.5 Z M 1621.5 379.5 L 1641.5 379.5 L 1641.5 517.5 L 1621.5 517.5 Z M 1621.5 379.5 "/>
 </clipPath>
-<image id="image474" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image501" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image474"/>
+  <use xlink:href="#image501"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 916.5 452.5 L 940.5 452.5 L 940.5 470.5 L 916.5 470.5 Z M 916.5 470.5 L 940.5 470.5 L 940.5 476.5 L 916.5 476.5 Z M 288.5 452.5 L 311.5 452.5 L 311.5 476.5 L 288.5 476.5 Z M 1272.5 452.5 L 1296.5 452.5 L 1296.5 476.5 L 1272.5 476.5 Z M 340.5 499.5 L 363.5 499.5 L 363.5 522.5 L 340.5 522.5 Z M 860.5 499.5 L 883.5 499.5 L 883.5 522.5 L 860.5 522.5 Z M 1330.5 499.5 L 1353.5 499.5 L 1353.5 522.5 L 1330.5 522.5 Z M 723.5 592.5 L 747.5 592.5 L 747.5 616.5 L 723.5 616.5 Z M 1533.5 592.5 L 1557.5 592.5 L 1557.5 616.5 L 1533.5 616.5 Z M 776.5 639.5 L 799.5 639.5 L 799.5 648.5 L 776.5 648.5 Z M 776.5 648.5 L 799.5 648.5 L 799.5 663.5 L 776.5 663.5 Z M 387.5 639.5 L 410.5 639.5 L 410.5 663.5 L 387.5 663.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image475" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image502" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image475"/>
+  <use xlink:href="#image502"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface469">
+<g id="surface496">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -217,6 +217,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 256.425781 725.539062 L 256.375 726.304688 L 256.257812 726.996094 L 256.042969 727.640625 L 255.757812 728.210938 L 255.375 728.757812 L 254.921875 729.234375 L 254.421875 729.640625 L 253.898438 729.953125 L 253.300781 730.191406 L 252.679688 730.378906 L 252.011719 730.476562 L 251.296875 730.5 L 243.453125 730.5 L 243.453125 713.117188 L 250.511719 713.117188 L 251.535156 713.191406 L 252.441406 713.355469 L 253.253906 713.644531 L 253.945312 714.046875 L 254.539062 714.574219 L 255.015625 715.214844 L 255.207031 715.574219 L 255.375 715.957031 L 255.496094 716.3125 L 255.589844 716.71875 L 255.636719 717.125 L 255.660156 717.53125 L 255.589844 718.386719 L 255.375 719.125 L 255.042969 719.820312 L 254.566406 720.390625 L 253.96875 720.914062 L 253.253906 721.320312 L 253.945312 721.628906 L 254.539062 721.964844 L 255.066406 722.347656 L 255.496094 722.773438 L 255.828125 723.226562 L 256.089844 723.703125 L 256.1875 723.992188 L 256.328125 724.5625 L 256.375 724.898438 L 256.402344 725.207031 Z M 253.445312 717.839844 L 253.371094 717.125 L 253.15625 716.527344 L 252.824219 716.003906 L 252.347656 715.621094 L 251.75 715.335938 L 251.011719 715.144531 L 250.84375 715.144531 L 250.679688 715.121094 L 250.511719 715.097656 L 250.128906 715.097656 L 249.960938 715.074219 L 245.671875 715.074219 L 245.671875 720.605469 L 249.960938 720.605469 L 250.84375 720.558594 L 251.609375 720.414062 L 252.25 720.152344 L 252.730469 719.792969 L 253.109375 719.316406 L 253.347656 718.746094 L 253.371094 718.625 L 253.394531 718.484375 L 253.421875 718.339844 L 253.421875 718.007812 Z M 251.082031 728.542969 L 251.75 728.519531 L 252.347656 728.378906 L 252.871094 728.140625 L 253.300781 727.828125 L 253.660156 727.425781 L 253.945312 726.921875 L 254.015625 726.734375 L 254.0625 726.519531 L 254.136719 726.28125 L 254.160156 726.066406 L 254.183594 725.828125 L 254.207031 725.566406 L 254.160156 725.039062 L 254.0625 724.539062 L 253.898438 724.109375 L 253.660156 723.703125 L 253.347656 723.371094 L 252.992188 723.0625 L 252.730469 722.917969 L 252.441406 722.796875 L 252.132812 722.703125 L 251.796875 722.632812 L 251.441406 722.585938 L 251.082031 722.558594 L 245.671875 722.558594 L 245.671875 728.542969 Z M 251.082031 728.542969 "/>
 <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 232 354 L 232 361 M 228 358 L 235 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 232 358 L 232 358 M 232 358 L 232 358 M 232 358 L 232 358 M 232 358 L 232 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_0.svg b/cells/einvn/sky130_fd_sc_hd__einvn_0.svg
index 609b069..1651d36 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_0.svg
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1064.5 729.5 L 1105.5 729.5 L 1105.5 844.5 L 1064.5 844.5 Z M 824.5 729.5 L 865.5 729.5 L 865.5 844.5 L 824.5 844.5 Z M 965.5 729.5 L 1006.5 729.5 L 1006.5 844.5 L 965.5 844.5 Z M 965.5 729.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 824.5 228.5 L 865.5 228.5 L 865.5 343.5 L 824.5 343.5 Z M 1064.5 228.5 L 1105.5 228.5 L 1105.5 403.5 L 1064.5 403.5 Z M 965.5 228.5 L 1006.5 228.5 L 1006.5 403.5 L 965.5 403.5 Z M 965.5 228.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_1.svg b/cells/einvn/sky130_fd_sc_hd__einvn_1.svg
index 9e6185e..3f8f1b7 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_1.svg
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image346" 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="#image346"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <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="#image346"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 756.5 729.5 L 797.5 729.5 L 797.5 844.5 L 756.5 844.5 Z M 998.5 666.5 L 1039.5 666.5 L 1039.5 844.5 L 998.5 844.5 Z M 998.5 666.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image347"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 756.5 228.5 L 797.5 228.5 L 797.5 403.5 L 756.5 403.5 Z M 1128.5 228.5 L 1169.5 228.5 L 1169.5 502.5 L 1128.5 502.5 Z M 886.5 228.5 L 927.5 228.5 L 927.5 502.5 L 886.5 502.5 Z M 886.5 228.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image349"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface316">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <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 687 194 L 734 194 M 687 148 L 734 148 M 687 148 L 687 194 M 734 148 L 734 194 " 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 687 194 L 734 194 M 687 148 L 734 148 M 734 194 L 734 148 M 687 194 L 687 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_2.svg b/cells/einvn/sky130_fd_sc_hd__einvn_2.svg
index cfdb3ed..fc8ca06 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_2.svg
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" 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="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 1251.5 666.5 L 1292.5 666.5 L 1292.5 844.5 L 1251.5 844.5 Z M 1001.5 666.5 L 1042.5 666.5 L 1042.5 844.5 L 1001.5 844.5 Z M 886.5 666.5 L 927.5 666.5 L 927.5 844.5 L 886.5 844.5 Z M 886.5 666.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 630.5 228.5 L 671.5 228.5 L 671.5 403.5 L 630.5 403.5 Z M 760.5 228.5 L 801.5 228.5 L 801.5 485.5 L 760.5 485.5 Z M 875.5 228.5 L 916.5 228.5 L 916.5 485.5 L 875.5 485.5 Z M 1251.5 228.5 L 1292.5 228.5 L 1292.5 502.5 L 1251.5 502.5 Z M 1136.5 228.5 L 1177.5 228.5 L 1177.5 502.5 L 1136.5 502.5 Z M 1136.5 228.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_4.svg b/cells/einvn/sky130_fd_sc_hd__einvn_4.svg
index a935603..9d67152 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_4.svg
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1452.5 666.5 L 1493.5 666.5 L 1493.5 844.5 L 1452.5 844.5 Z M 376.5 666.5 L 417.5 666.5 L 417.5 844.5 L 376.5 844.5 Z M 633.5 666.5 L 674.5 666.5 L 674.5 844.5 L 633.5 844.5 Z M 748.5 666.5 L 789.5 666.5 L 789.5 844.5 L 748.5 844.5 Z M 863.5 666.5 L 904.5 666.5 L 904.5 844.5 L 863.5 844.5 Z M 977.5 666.5 L 1018.5 666.5 L 1018.5 844.5 L 977.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1222.5 666.5 L 1263.5 666.5 L 1263.5 844.5 L 1222.5 844.5 Z M 1337.5 666.5 L 1378.5 666.5 L 1378.5 844.5 L 1337.5 844.5 Z M 1337.5 666.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 850.5 228.5 L 891.5 228.5 L 891.5 485.5 L 850.5 485.5 Z M 506.5 228.5 L 547.5 228.5 L 547.5 485.5 L 506.5 485.5 Z M 735.5 228.5 L 776.5 228.5 L 776.5 485.5 L 735.5 485.5 Z M 620.5 228.5 L 661.5 228.5 L 661.5 485.5 L 620.5 485.5 Z M 1222.5 228.5 L 1263.5 228.5 L 1263.5 502.5 L 1222.5 502.5 Z M 1337.5 228.5 L 1378.5 228.5 L 1378.5 502.5 L 1337.5 502.5 Z M 1452.5 228.5 L 1493.5 228.5 L 1493.5 502.5 L 1452.5 502.5 Z M 1107.5 228.5 L 1148.5 228.5 L 1148.5 502.5 L 1107.5 502.5 Z M 376.5 228.5 L 417.5 228.5 L 417.5 502.5 L 376.5 502.5 Z M 376.5 228.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 309 194 L 355 194 M 309 148 L 355 148 M 309 148 L 309 194 M 355 148 L 355 194 " 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 309 194 L 355 194 M 309 148 L 355 148 M 355 194 L 355 148 M 309 194 L 309 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hd__einvn_8.svg b/cells/einvn/sky130_fd_sc_hd__einvn_8.svg
index fb5bca6..06a05f8 100644
--- a/cells/einvn/sky130_fd_sc_hd__einvn_8.svg
+++ b/cells/einvn/sky130_fd_sc_hd__einvn_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" 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="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 621.5 L 1630.5 621.5 L 1630.5 739.5 L 1603.5 739.5 Z M 281.5 621.5 L 308.5 621.5 L 308.5 739.5 L 281.5 739.5 Z M 451.5 621.5 L 478.5 621.5 L 478.5 739.5 L 451.5 739.5 Z M 527.5 621.5 L 554.5 621.5 L 554.5 739.5 L 527.5 739.5 Z M 603.5 621.5 L 630.5 621.5 L 630.5 739.5 L 603.5 739.5 Z M 679.5 621.5 L 706.5 621.5 L 706.5 739.5 L 679.5 739.5 Z M 755.5 621.5 L 783.5 621.5 L 783.5 739.5 L 755.5 739.5 Z M 832.5 621.5 L 859.5 621.5 L 859.5 739.5 L 832.5 739.5 Z M 908.5 621.5 L 935.5 621.5 L 935.5 739.5 L 908.5 739.5 Z M 984.5 621.5 L 1011.5 621.5 L 1011.5 739.5 L 984.5 739.5 Z M 1070.5 621.5 L 1097.5 621.5 L 1097.5 739.5 L 1070.5 739.5 Z M 1146.5 621.5 L 1173.5 621.5 L 1173.5 739.5 L 1146.5 739.5 Z M 1222.5 621.5 L 1249.5 621.5 L 1249.5 739.5 L 1222.5 739.5 Z M 1298.5 621.5 L 1325.5 621.5 L 1325.5 739.5 L 1298.5 739.5 Z M 1374.5 621.5 L 1401.5 621.5 L 1401.5 739.5 L 1374.5 739.5 Z M 1450.5 621.5 L 1477.5 621.5 L 1477.5 739.5 L 1450.5 739.5 Z M 1526.5 621.5 L 1554.5 621.5 L 1554.5 739.5 L 1526.5 739.5 Z M 1526.5 621.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 899.5 331.5 L 927.5 331.5 L 927.5 501.5 L 899.5 501.5 Z M 823.5 331.5 L 851.5 331.5 L 851.5 501.5 L 823.5 501.5 Z M 367.5 331.5 L 394.5 331.5 L 394.5 501.5 L 367.5 501.5 Z M 443.5 331.5 L 470.5 331.5 L 470.5 501.5 L 443.5 501.5 Z M 747.5 331.5 L 774.5 331.5 L 774.5 501.5 L 747.5 501.5 Z M 671.5 331.5 L 698.5 331.5 L 698.5 501.5 L 671.5 501.5 Z M 595.5 331.5 L 622.5 331.5 L 622.5 501.5 L 595.5 501.5 Z M 519.5 331.5 L 546.5 331.5 L 546.5 501.5 L 519.5 501.5 Z M 1298.5 331.5 L 1325.5 331.5 L 1325.5 512.5 L 1298.5 512.5 Z M 1374.5 331.5 L 1401.5 331.5 L 1401.5 512.5 L 1374.5 512.5 Z M 1526.5 331.5 L 1554.5 331.5 L 1554.5 512.5 L 1526.5 512.5 Z M 1222.5 331.5 L 1249.5 331.5 L 1249.5 512.5 L 1222.5 512.5 Z M 1450.5 331.5 L 1477.5 331.5 L 1477.5 512.5 L 1450.5 512.5 Z M 1070.5 331.5 L 1097.5 331.5 L 1097.5 512.5 L 1070.5 512.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 512.5 L 281.5 512.5 Z M 1603.5 331.5 L 1630.5 331.5 L 1630.5 512.5 L 1603.5 512.5 Z M 1146.5 331.5 L 1173.5 331.5 L 1173.5 512.5 L 1146.5 512.5 Z M 1146.5 331.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface308">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 236 313 L 267 313 M 236 282 L 267 282 M 236 282 L 236 313 M 267 282 L 267 313 " 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 236 313 L 267 313 M 236 282 L 267 282 M 267 313 L 267 282 M 236 313 L 236 282 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_1.svg b/cells/einvp/sky130_fd_sc_hd__einvp_1.svg
index db2d7d2..9a03311 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_1.svg
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image293"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1125.5 666.5 L 1166.5 666.5 L 1166.5 844.5 L 1125.5 844.5 Z M 756.5 729.5 L 797.5 729.5 L 797.5 844.5 L 756.5 844.5 Z M 886.5 666.5 L 927.5 666.5 L 927.5 844.5 L 886.5 844.5 Z M 886.5 666.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 756.5 228.5 L 797.5 228.5 L 797.5 343.5 L 756.5 343.5 Z M 1125.5 228.5 L 1166.5 228.5 L 1166.5 502.5 L 1125.5 502.5 Z M 984.5 228.5 L 1025.5 228.5 L 1025.5 502.5 L 984.5 502.5 Z M 984.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image296" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 689 194 L 735 194 M 689 148 L 735 148 M 689 148 L 689 194 M 735 148 L 735 194 " 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 689 194 L 735 194 M 689 148 L 735 148 M 735 194 L 735 148 M 689 194 L 689 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_2.svg b/cells/einvp/sky130_fd_sc_hd__einvp_2.svg
index 4fc581d..a210912 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_2.svg
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" 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="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1132.5 666.5 L 1173.5 666.5 L 1173.5 844.5 L 1132.5 844.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 1247.5 666.5 L 1288.5 666.5 L 1288.5 844.5 L 1247.5 844.5 Z M 875.5 666.5 L 916.5 666.5 L 916.5 844.5 L 875.5 844.5 Z M 760.5 666.5 L 801.5 666.5 L 801.5 844.5 L 760.5 844.5 Z M 760.5 666.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 630.5 228.5 L 671.5 228.5 L 671.5 403.5 L 630.5 403.5 Z M 887.5 228.5 L 928.5 228.5 L 928.5 485.5 L 887.5 485.5 Z M 1002.5 228.5 L 1043.5 228.5 L 1043.5 485.5 L 1002.5 485.5 Z M 1247.5 228.5 L 1288.5 228.5 L 1288.5 502.5 L 1247.5 502.5 Z M 1132.5 228.5 L 1173.5 228.5 L 1173.5 502.5 L 1132.5 502.5 Z M 1132.5 228.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,5 @@
 <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 563 194 L 610 194 M 563 148 L 610 148 M 563 148 L 563 194 M 610 148 L 610 194 " 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 563 194 L 610 194 M 563 148 L 610 148 M 610 194 L 610 148 M 563 194 L 563 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_4.svg b/cells/einvp/sky130_fd_sc_hd__einvp_4.svg
index 4c5970e..c919bcf 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_4.svg
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" 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="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1452.5 666.5 L 1493.5 666.5 L 1493.5 844.5 L 1452.5 844.5 Z M 376.5 666.5 L 417.5 666.5 L 417.5 844.5 L 376.5 844.5 Z M 491.5 666.5 L 532.5 666.5 L 532.5 844.5 L 491.5 844.5 Z M 611.5 666.5 L 652.5 666.5 L 652.5 844.5 L 611.5 844.5 Z M 726.5 666.5 L 767.5 666.5 L 767.5 844.5 L 726.5 844.5 Z M 841.5 666.5 L 882.5 666.5 L 882.5 844.5 L 841.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1222.5 666.5 L 1263.5 666.5 L 1263.5 844.5 L 1222.5 844.5 Z M 1337.5 666.5 L 1378.5 666.5 L 1378.5 844.5 L 1337.5 844.5 Z M 1337.5 666.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 977.5 228.5 L 1018.5 228.5 L 1018.5 485.5 L 977.5 485.5 Z M 633.5 228.5 L 674.5 228.5 L 674.5 485.5 L 633.5 485.5 Z M 863.5 228.5 L 904.5 228.5 L 904.5 485.5 L 863.5 485.5 Z M 748.5 228.5 L 789.5 228.5 L 789.5 485.5 L 748.5 485.5 Z M 1222.5 228.5 L 1263.5 228.5 L 1263.5 502.5 L 1222.5 502.5 Z M 1337.5 228.5 L 1378.5 228.5 L 1378.5 502.5 L 1337.5 502.5 Z M 1452.5 228.5 L 1493.5 228.5 L 1493.5 502.5 L 1452.5 502.5 Z M 1107.5 228.5 L 1148.5 228.5 L 1148.5 502.5 L 1107.5 502.5 Z M 376.5 228.5 L 417.5 228.5 L 417.5 502.5 L 376.5 502.5 Z M 376.5 228.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,5 @@
 <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 309 194 L 355 194 M 309 148 L 355 148 M 309 148 L 309 194 M 355 148 L 355 194 " 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 309 194 L 355 194 M 309 148 L 355 148 M 355 194 L 355 148 M 309 194 L 309 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hd__einvp_8.svg b/cells/einvp/sky130_fd_sc_hd__einvp_8.svg
index abe40bb..2a31b84 100644
--- a/cells/einvp/sky130_fd_sc_hd__einvp_8.svg
+++ b/cells/einvp/sky130_fd_sc_hd__einvp_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <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="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 621.5 L 1630.5 621.5 L 1630.5 739.5 L 1603.5 739.5 Z M 281.5 621.5 L 308.5 621.5 L 308.5 739.5 L 281.5 739.5 Z M 357.5 621.5 L 384.5 621.5 L 384.5 739.5 L 357.5 739.5 Z M 436.5 621.5 L 464.5 621.5 L 464.5 739.5 L 436.5 739.5 Z M 513.5 621.5 L 540.5 621.5 L 540.5 739.5 L 513.5 739.5 Z M 589.5 621.5 L 616.5 621.5 L 616.5 739.5 L 589.5 739.5 Z M 665.5 621.5 L 692.5 621.5 L 692.5 739.5 L 665.5 739.5 Z M 741.5 621.5 L 768.5 621.5 L 768.5 739.5 L 741.5 739.5 Z M 817.5 621.5 L 844.5 621.5 L 844.5 739.5 L 817.5 739.5 Z M 893.5 621.5 L 920.5 621.5 L 920.5 739.5 L 893.5 739.5 Z M 1070.5 621.5 L 1097.5 621.5 L 1097.5 739.5 L 1070.5 739.5 Z M 1146.5 621.5 L 1173.5 621.5 L 1173.5 739.5 L 1146.5 739.5 Z M 1222.5 621.5 L 1249.5 621.5 L 1249.5 739.5 L 1222.5 739.5 Z M 1298.5 621.5 L 1325.5 621.5 L 1325.5 739.5 L 1298.5 739.5 Z M 1374.5 621.5 L 1401.5 621.5 L 1401.5 739.5 L 1374.5 739.5 Z M 1450.5 621.5 L 1477.5 621.5 L 1477.5 739.5 L 1450.5 739.5 Z M 1526.5 621.5 L 1554.5 621.5 L 1554.5 739.5 L 1526.5 739.5 Z M 1526.5 621.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 984.5 331.5 L 1011.5 331.5 L 1011.5 501.5 L 984.5 501.5 Z M 908.5 331.5 L 935.5 331.5 L 935.5 501.5 L 908.5 501.5 Z M 451.5 331.5 L 478.5 331.5 L 478.5 501.5 L 451.5 501.5 Z M 527.5 331.5 L 554.5 331.5 L 554.5 501.5 L 527.5 501.5 Z M 832.5 331.5 L 859.5 331.5 L 859.5 501.5 L 832.5 501.5 Z M 755.5 331.5 L 783.5 331.5 L 783.5 501.5 L 755.5 501.5 Z M 679.5 331.5 L 706.5 331.5 L 706.5 501.5 L 679.5 501.5 Z M 603.5 331.5 L 630.5 331.5 L 630.5 501.5 L 603.5 501.5 Z M 1298.5 331.5 L 1325.5 331.5 L 1325.5 512.5 L 1298.5 512.5 Z M 1374.5 331.5 L 1401.5 331.5 L 1401.5 512.5 L 1374.5 512.5 Z M 1526.5 331.5 L 1554.5 331.5 L 1554.5 512.5 L 1526.5 512.5 Z M 1222.5 331.5 L 1249.5 331.5 L 1249.5 512.5 L 1222.5 512.5 Z M 1450.5 331.5 L 1477.5 331.5 L 1477.5 512.5 L 1450.5 512.5 Z M 1070.5 331.5 L 1097.5 331.5 L 1097.5 512.5 L 1070.5 512.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 512.5 L 281.5 512.5 Z M 1603.5 331.5 L 1630.5 331.5 L 1630.5 512.5 L 1603.5 512.5 Z M 1146.5 331.5 L 1173.5 331.5 L 1173.5 512.5 L 1146.5 512.5 Z M 1146.5 331.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -184,6 +184,5 @@
 <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 236 313 L 267 313 M 236 282 L 267 282 M 236 282 L 236 313 M 267 282 L 267 313 " 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 236 313 L 267 313 M 236 282 L 267 282 M 267 313 L 267 282 M 236 313 L 236 282 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hd__fa_1.svg b/cells/fa/sky130_fd_sc_hd__fa_1.svg
index 5f20f40..3d14ba1 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_1.svg
+++ b/cells/fa/sky130_fd_sc_hd__fa_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image418" 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="#image391"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 484.5 678.5 L 514.5 678.5 L 514.5 763.5 L 484.5 763.5 Z M 1458.5 678.5 L 1489.5 678.5 L 1489.5 763.5 L 1458.5 763.5 Z M 1361.5 678.5 L 1391.5 678.5 L 1391.5 763.5 L 1361.5 763.5 Z M 1288.5 678.5 L 1318.5 678.5 L 1318.5 763.5 L 1288.5 763.5 Z M 1191.5 678.5 L 1221.5 678.5 L 1221.5 763.5 L 1191.5 763.5 Z M 1100.5 678.5 L 1131.5 678.5 L 1131.5 763.5 L 1100.5 763.5 Z M 1015.5 678.5 L 1046.5 678.5 L 1046.5 763.5 L 1015.5 763.5 Z M 930.5 678.5 L 960.5 678.5 L 960.5 763.5 L 930.5 763.5 Z M 739.5 678.5 L 770.5 678.5 L 770.5 763.5 L 739.5 763.5 Z M 654.5 678.5 L 685.5 678.5 L 685.5 763.5 L 654.5 763.5 Z M 569.5 678.5 L 599.5 678.5 L 599.5 763.5 L 569.5 763.5 Z M 393.5 678.5 L 423.5 678.5 L 423.5 763.5 L 393.5 763.5 Z M 1559.5 631.5 L 1589.5 631.5 L 1589.5 763.5 L 1559.5 763.5 Z M 1559.5 631.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1458.5 307.5 L 1489.5 307.5 L 1489.5 392.5 L 1458.5 392.5 Z M 1288.5 307.5 L 1318.5 307.5 L 1318.5 392.5 L 1288.5 392.5 Z M 393.5 307.5 L 423.5 307.5 L 423.5 392.5 L 393.5 392.5 Z M 484.5 307.5 L 514.5 307.5 L 514.5 392.5 L 484.5 392.5 Z M 569.5 307.5 L 599.5 307.5 L 599.5 392.5 L 569.5 392.5 Z M 654.5 307.5 L 685.5 307.5 L 685.5 392.5 L 654.5 392.5 Z M 930.5 307.5 L 960.5 307.5 L 960.5 392.5 L 930.5 392.5 Z M 739.5 307.5 L 770.5 307.5 L 770.5 392.5 L 739.5 392.5 Z M 1015.5 307.5 L 1046.5 307.5 L 1046.5 392.5 L 1015.5 392.5 Z M 1100.5 307.5 L 1131.5 307.5 L 1131.5 392.5 L 1100.5 392.5 Z M 1191.5 307.5 L 1221.5 307.5 L 1221.5 392.5 L 1191.5 392.5 Z M 1361.5 307.5 L 1391.5 307.5 L 1391.5 392.5 L 1361.5 392.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 1559.5 307.5 L 1589.5 307.5 L 1589.5 510.5 L 1559.5 510.5 Z M 1559.5 307.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 1366.5 483.5 L 1400.5 483.5 L 1400.5 487.5 L 1366.5 487.5 Z M 900.5 483.5 L 934.5 483.5 L 934.5 504.5 L 900.5 504.5 Z M 522.5 483.5 L 557.5 483.5 L 557.5 518.5 L 522.5 518.5 Z M 1366.5 487.5 L 1400.5 487.5 L 1400.5 518.5 L 1366.5 518.5 Z M 900.5 504.5 L 934.5 504.5 L 934.5 518.5 L 900.5 518.5 Z M 429.5 552.5 L 464.5 552.5 L 464.5 558.5 L 429.5 558.5 Z M 1459.5 552.5 L 1494.5 552.5 L 1494.5 566.5 L 1459.5 566.5 Z M 1086.5 552.5 L 1121.5 552.5 L 1121.5 583.5 L 1086.5 583.5 Z M 1086.5 583.5 L 1121.5 583.5 L 1121.5 587.5 L 1086.5 587.5 Z M 709.5 552.5 L 743.5 552.5 L 743.5 587.5 L 709.5 587.5 Z M 1459.5 566.5 L 1494.5 566.5 L 1494.5 587.5 L 1459.5 587.5 Z M 429.5 558.5 L 464.5 558.5 L 464.5 587.5 L 429.5 587.5 Z M 522.5 621.5 L 557.5 621.5 L 557.5 656.5 L 522.5 656.5 Z M 1273.5 621.5 L 1307.5 621.5 L 1307.5 656.5 L 1273.5 656.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface388">
+<g id="surface415">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -205,6 +205,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hd__fa_2.svg b/cells/fa/sky130_fd_sc_hd__fa_2.svg
index 595cbcb..3c321f8 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_2.svg
+++ b/cells/fa/sky130_fd_sc_hd__fa_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 235.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 282.5 621.5 L 309.5 621.5 L 309.5 739.5 L 282.5 739.5 Z M 534.5 662.5 L 562.5 662.5 L 562.5 739.5 L 534.5 739.5 Z M 448.5 662.5 L 475.5 662.5 L 475.5 739.5 L 448.5 739.5 Z M 1416.5 662.5 L 1443.5 662.5 L 1443.5 739.5 L 1416.5 739.5 Z M 1329.5 662.5 L 1356.5 662.5 L 1356.5 739.5 L 1329.5 739.5 Z M 1264.5 662.5 L 1291.5 662.5 L 1291.5 739.5 L 1264.5 739.5 Z M 1166.5 662.5 L 1193.5 662.5 L 1193.5 739.5 L 1166.5 739.5 Z M 1085.5 662.5 L 1112.5 662.5 L 1112.5 739.5 L 1085.5 739.5 Z M 1009.5 662.5 L 1036.5 662.5 L 1036.5 739.5 L 1009.5 739.5 Z M 933.5 662.5 L 960.5 662.5 L 960.5 739.5 L 933.5 739.5 Z M 763.5 662.5 L 790.5 662.5 L 790.5 739.5 L 763.5 739.5 Z M 687.5 662.5 L 714.5 662.5 L 714.5 739.5 L 687.5 739.5 Z M 610.5 662.5 L 638.5 662.5 L 638.5 739.5 L 610.5 739.5 Z M 1603.5 621.5 L 1631.5 621.5 L 1631.5 739.5 L 1603.5 739.5 Z M 1506.5 621.5 L 1533.5 621.5 L 1533.5 739.5 L 1506.5 739.5 Z M 358.5 621.5 L 385.5 621.5 L 385.5 739.5 L 358.5 739.5 Z M 358.5 621.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1427.5 331.5 L 1454.5 331.5 L 1454.5 445.5 L 1427.5 445.5 Z M 1329.5 331.5 L 1356.5 331.5 L 1356.5 445.5 L 1329.5 445.5 Z M 763.5 331.5 L 790.5 331.5 L 790.5 445.5 L 763.5 445.5 Z M 687.5 331.5 L 714.5 331.5 L 714.5 445.5 L 687.5 445.5 Z M 610.5 331.5 L 638.5 331.5 L 638.5 445.5 L 610.5 445.5 Z M 524.5 331.5 L 552.5 331.5 L 552.5 445.5 L 524.5 445.5 Z M 444.5 331.5 L 471.5 331.5 L 471.5 445.5 L 444.5 445.5 Z M 1085.5 331.5 L 1112.5 331.5 L 1112.5 447.5 L 1085.5 447.5 Z M 1009.5 331.5 L 1036.5 331.5 L 1036.5 447.5 L 1009.5 447.5 Z M 933.5 331.5 L 960.5 331.5 L 960.5 447.5 L 933.5 447.5 Z M 1243.5 331.5 L 1270.5 331.5 L 1270.5 447.5 L 1243.5 447.5 Z M 1166.5 331.5 L 1193.5 331.5 L 1193.5 447.5 L 1166.5 447.5 Z M 1513.5 331.5 L 1540.5 331.5 L 1540.5 512.5 L 1513.5 512.5 Z M 358.5 331.5 L 385.5 331.5 L 385.5 512.5 L 358.5 512.5 Z M 282.5 331.5 L 309.5 331.5 L 309.5 512.5 L 282.5 512.5 Z M 1589.5 331.5 L 1616.5 331.5 L 1616.5 512.5 L 1589.5 512.5 Z M 1589.5 331.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 906.5 489.5 L 937.5 489.5 L 937.5 490.5 L 906.5 490.5 Z M 906.5 490.5 L 937.5 490.5 L 937.5 519.5 L 906.5 519.5 Z M 1406.5 489.5 L 1437.5 489.5 L 1437.5 519.5 L 1406.5 519.5 Z M 569.5 489.5 L 600.5 489.5 L 600.5 519.5 L 569.5 519.5 Z M 1073.5 550.5 L 1103.5 550.5 L 1103.5 577.5 L 1073.5 577.5 Z M 1073.5 577.5 L 1103.5 577.5 L 1103.5 581.5 L 1073.5 581.5 Z M 1323.5 550.5 L 1353.5 550.5 L 1353.5 581.5 L 1323.5 581.5 Z M 485.5 550.5 L 516.5 550.5 L 516.5 581.5 L 485.5 581.5 Z M 735.5 550.5 L 766.5 550.5 L 766.5 581.5 L 735.5 581.5 Z M 569.5 612.5 L 600.5 612.5 L 600.5 643.5 L 569.5 643.5 Z M 1239.5 612.5 L 1270.5 612.5 L 1270.5 643.5 L 1239.5 643.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,5 @@
 <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 235 806 L 266 806 M 235 775 L 266 775 M 235 775 L 235 806 M 266 775 L 266 806 " 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 235 806 L 266 806 M 235 775 L 266 775 M 266 806 L 266 775 M 235 806 L 235 775 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hd__fa_4.svg b/cells/fa/sky130_fd_sc_hd__fa_4.svg
index 2310c3e..526cdb3 100644
--- a/cells/fa/sky130_fd_sc_hd__fa_4.svg
+++ b/cells/fa/sky130_fd_sc_hd__fa_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" 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="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <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="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 525.5 640.5 L 547.5 640.5 L 547.5 702.5 L 525.5 702.5 Z M 735.5 640.5 L 757.5 640.5 L 757.5 702.5 L 735.5 702.5 Z M 672.5 640.5 L 695.5 640.5 L 695.5 702.5 L 672.5 702.5 Z M 596.5 640.5 L 618.5 640.5 L 618.5 702.5 L 596.5 702.5 Z M 1336.5 640.5 L 1359.5 640.5 L 1359.5 702.5 L 1336.5 702.5 Z M 1265.5 640.5 L 1287.5 640.5 L 1287.5 702.5 L 1265.5 702.5 Z M 1211.5 640.5 L 1233.5 640.5 L 1233.5 702.5 L 1211.5 702.5 Z M 1130.5 640.5 L 1153.5 640.5 L 1153.5 702.5 L 1130.5 702.5 Z M 1064.5 640.5 L 1086.5 640.5 L 1086.5 702.5 L 1064.5 702.5 Z M 1001.5 640.5 L 1023.5 640.5 L 1023.5 702.5 L 1001.5 702.5 Z M 938.5 640.5 L 961.5 640.5 L 961.5 702.5 L 938.5 702.5 Z M 798.5 640.5 L 820.5 640.5 L 820.5 702.5 L 798.5 702.5 Z M 1554.5 605.5 L 1576.5 605.5 L 1576.5 702.5 L 1554.5 702.5 Z M 1491.5 605.5 L 1513.5 605.5 L 1513.5 702.5 L 1491.5 702.5 Z M 1416.5 605.5 L 1439.5 605.5 L 1439.5 702.5 L 1416.5 702.5 Z M 1616.5 605.5 L 1639.5 605.5 L 1639.5 702.5 L 1616.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 325.5 605.5 "/>
 </clipPath>
-<image id="image324" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1345.5 366.5 L 1368.5 366.5 L 1368.5 460.5 L 1345.5 460.5 Z M 521.5 366.5 L 544.5 366.5 L 544.5 460.5 L 521.5 460.5 Z M 1265.5 366.5 L 1287.5 366.5 L 1287.5 460.5 L 1265.5 460.5 Z M 588.5 366.5 L 610.5 366.5 L 610.5 460.5 L 588.5 460.5 Z M 1130.5 366.5 L 1153.5 366.5 L 1153.5 462.5 L 1130.5 462.5 Z M 1064.5 366.5 L 1086.5 366.5 L 1086.5 462.5 L 1064.5 462.5 Z M 1194.5 366.5 L 1216.5 366.5 L 1216.5 462.5 L 1194.5 462.5 Z M 1001.5 366.5 L 1023.5 366.5 L 1023.5 462.5 L 1001.5 462.5 Z M 938.5 366.5 L 961.5 366.5 L 961.5 462.5 L 938.5 462.5 Z M 798.5 366.5 L 820.5 366.5 L 820.5 462.5 L 798.5 462.5 Z M 735.5 366.5 L 757.5 366.5 L 757.5 462.5 L 735.5 462.5 Z M 672.5 366.5 L 695.5 366.5 L 695.5 462.5 L 672.5 462.5 Z M 1616.5 366.5 L 1639.5 366.5 L 1639.5 516.5 L 1616.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 1416.5 366.5 L 1439.5 366.5 L 1439.5 516.5 L 1416.5 516.5 Z M 1479.5 366.5 L 1501.5 366.5 L 1501.5 516.5 L 1479.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 1554.5 366.5 L 1576.5 366.5 L 1576.5 516.5 L 1554.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 388.5 366.5 "/>
 </clipPath>
-<image id="image325" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 916.5 496.5 L 941.5 496.5 L 941.5 498.5 L 916.5 498.5 Z M 916.5 498.5 L 941.5 498.5 L 941.5 522.5 L 916.5 522.5 Z M 1328.5 496.5 L 1353.5 496.5 L 1353.5 522.5 L 1328.5 522.5 Z M 638.5 496.5 L 663.5 496.5 L 663.5 522.5 L 638.5 522.5 Z M 1053.5 547.5 L 1079.5 547.5 L 1079.5 569.5 L 1053.5 569.5 Z M 1053.5 569.5 L 1079.5 569.5 L 1079.5 572.5 L 1053.5 572.5 Z M 1259.5 547.5 L 1285.5 547.5 L 1285.5 572.5 L 1259.5 572.5 Z M 569.5 547.5 L 594.5 547.5 L 594.5 572.5 L 569.5 572.5 Z M 775.5 547.5 L 801.5 547.5 L 801.5 572.5 L 775.5 572.5 Z M 638.5 598.5 L 663.5 598.5 L 663.5 623.5 L 638.5 623.5 Z M 1191.5 598.5 L 1216.5 598.5 L 1216.5 623.5 L 1191.5 623.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image326" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface320">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 225 761 L 251 761 M 225 735 L 251 735 M 225 735 L 225 761 M 251 735 L 251 761 " 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 225 761 L 251 761 M 225 735 L 251 735 M 251 761 L 251 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fah/sky130_fd_sc_hd__fah_1.svg b/cells/fah/sky130_fd_sc_hd__fah_1.svg
index 27d3573..c4e97be 100644
--- a/cells/fah/sky130_fd_sc_hd__fah_1.svg
+++ b/cells/fah/sky130_fd_sc_hd__fah_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 344.5 L 1744.5 344.5 L 1744.5 541.5 L 175.5 541.5 Z M 175.5 344.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 216.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1439.5 592.5 L 1457.5 592.5 L 1457.5 671.5 L 1439.5 671.5 Z M 1388.5 592.5 L 1406.5 592.5 L 1406.5 671.5 L 1388.5 671.5 Z M 1003.5 592.5 L 1022.5 592.5 L 1022.5 671.5 L 1003.5 671.5 Z M 888.5 592.5 L 906.5 592.5 L 906.5 671.5 L 888.5 671.5 Z M 1225.5 592.5 L 1243.5 592.5 L 1243.5 671.5 L 1225.5 671.5 Z M 420.5 592.5 L 438.5 592.5 L 438.5 671.5 L 420.5 671.5 Z M 1171.5 592.5 L 1189.5 592.5 L 1189.5 671.5 L 1171.5 671.5 Z M 1055.5 592.5 L 1074.5 592.5 L 1074.5 671.5 L 1055.5 671.5 Z M 304.5 593.5 L 323.5 593.5 L 323.5 672.5 L 304.5 672.5 Z M 1591.5 592.5 L 1609.5 592.5 L 1609.5 672.5 L 1591.5 672.5 Z M 672.5 593.5 L 691.5 593.5 L 691.5 672.5 L 672.5 672.5 Z M 1642.5 592.5 L 1660.5 592.5 L 1660.5 672.5 L 1642.5 672.5 Z M 797.5 593.5 L 816.5 593.5 L 816.5 672.5 L 797.5 672.5 Z M 620.5 593.5 L 639.5 593.5 L 639.5 672.5 L 620.5 672.5 Z M 503.5 592.5 L 521.5 592.5 L 521.5 672.5 L 503.5 672.5 Z M 246.5 592.5 L 265.5 592.5 L 265.5 672.5 L 246.5 672.5 Z M 246.5 592.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 861.5 400.5 L 879.5 400.5 L 879.5 503.5 L 861.5 503.5 Z M 1286.5 405.5 L 1305.5 405.5 L 1305.5 507.5 L 1286.5 507.5 Z M 1235.5 405.5 L 1253.5 405.5 L 1253.5 507.5 L 1235.5 507.5 Z M 672.5 416.5 L 691.5 416.5 L 691.5 519.5 L 672.5 519.5 Z M 996.5 416.5 L 1014.5 416.5 L 1014.5 519.5 L 996.5 519.5 Z M 1047.5 416.5 L 1066.5 416.5 L 1066.5 519.5 L 1047.5 519.5 Z M 249.5 396.5 L 267.5 396.5 L 267.5 519.5 L 249.5 519.5 Z M 1642.5 396.5 L 1660.5 396.5 L 1660.5 519.5 L 1642.5 519.5 Z M 491.5 396.5 L 509.5 396.5 L 509.5 519.5 L 491.5 519.5 Z M 1389.5 396.5 L 1408.5 396.5 L 1408.5 519.5 L 1389.5 519.5 Z M 1591.5 396.5 L 1609.5 396.5 L 1609.5 519.5 L 1591.5 519.5 Z M 1441.5 396.5 L 1459.5 396.5 L 1459.5 519.5 L 1441.5 519.5 Z M 620.5 416.5 L 639.5 416.5 L 639.5 519.5 L 620.5 519.5 Z M 304.5 396.5 L 322.5 396.5 L 322.5 519.5 L 304.5 519.5 Z M 422.5 396.5 L 440.5 396.5 L 440.5 519.5 L 422.5 519.5 Z M 802.5 416.5 L 820.5 416.5 L 820.5 519.5 L 802.5 519.5 Z M 802.5 416.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 357.5 L 236.5 357.5 L 236.5 378.5 L 216.5 378.5 Z M 1682.5 357.5 L 1703.5 357.5 L 1703.5 378.5 L 1682.5 378.5 Z M 1625.5 357.5 L 1646.5 357.5 L 1646.5 378.5 L 1625.5 378.5 Z M 1569.5 357.5 L 1590.5 357.5 L 1590.5 378.5 L 1569.5 378.5 Z M 1513.5 357.5 L 1534.5 357.5 L 1534.5 378.5 L 1513.5 378.5 Z M 1456.5 357.5 L 1477.5 357.5 L 1477.5 378.5 L 1456.5 378.5 Z M 1400.5 357.5 L 1421.5 357.5 L 1421.5 378.5 L 1400.5 378.5 Z M 1343.5 357.5 L 1364.5 357.5 L 1364.5 378.5 L 1343.5 378.5 Z M 1287.5 357.5 L 1308.5 357.5 L 1308.5 378.5 L 1287.5 378.5 Z M 1231.5 357.5 L 1252.5 357.5 L 1252.5 378.5 L 1231.5 378.5 Z M 1174.5 357.5 L 1195.5 357.5 L 1195.5 378.5 L 1174.5 378.5 Z M 1118.5 357.5 L 1139.5 357.5 L 1139.5 378.5 L 1118.5 378.5 Z M 1062.5 357.5 L 1082.5 357.5 L 1082.5 378.5 L 1062.5 378.5 Z M 1005.5 357.5 L 1026.5 357.5 L 1026.5 378.5 L 1005.5 378.5 Z M 949.5 357.5 L 970.5 357.5 L 970.5 378.5 L 949.5 378.5 Z M 892.5 357.5 L 913.5 357.5 L 913.5 378.5 L 892.5 378.5 Z M 836.5 357.5 L 857.5 357.5 L 857.5 378.5 L 836.5 378.5 Z M 780.5 357.5 L 800.5 357.5 L 800.5 378.5 L 780.5 378.5 Z M 723.5 357.5 L 744.5 357.5 L 744.5 378.5 L 723.5 378.5 Z M 667.5 357.5 L 688.5 357.5 L 688.5 378.5 L 667.5 378.5 Z M 610.5 357.5 L 631.5 357.5 L 631.5 378.5 L 610.5 378.5 Z M 554.5 357.5 L 575.5 357.5 L 575.5 378.5 L 554.5 378.5 Z M 498.5 357.5 L 518.5 357.5 L 518.5 378.5 L 498.5 378.5 Z M 441.5 357.5 L 462.5 357.5 L 462.5 378.5 L 441.5 378.5 Z M 385.5 357.5 L 406.5 357.5 L 406.5 378.5 L 385.5 378.5 Z M 328.5 357.5 L 349.5 357.5 L 349.5 378.5 L 328.5 378.5 Z M 272.5 357.5 L 293.5 357.5 L 293.5 378.5 L 272.5 378.5 Z M 881.5 461.5 L 902.5 461.5 L 902.5 462.5 L 881.5 462.5 Z M 881.5 462.5 L 902.5 462.5 L 902.5 482.5 L 881.5 482.5 Z M 1311.5 461.5 L 1332.5 461.5 L 1332.5 482.5 L 1311.5 482.5 Z M 686.5 461.5 L 707.5 461.5 L 707.5 482.5 L 686.5 482.5 Z M 1488.5 461.5 L 1508.5 461.5 L 1508.5 482.5 L 1488.5 482.5 Z M 498.5 503.5 L 519.5 503.5 L 519.5 511.5 L 498.5 511.5 Z M 952.5 503.5 L 973.5 503.5 L 973.5 512.5 L 952.5 512.5 Z M 1235.5 503.5 L 1256.5 503.5 L 1256.5 523.5 L 1235.5 523.5 Z M 1630.5 503.5 L 1651.5 503.5 L 1651.5 523.5 L 1630.5 523.5 Z M 733.5 503.5 L 754.5 503.5 L 754.5 523.5 L 733.5 523.5 Z M 952.5 512.5 L 973.5 512.5 L 973.5 523.5 L 952.5 523.5 Z M 498.5 511.5 L 519.5 511.5 L 519.5 523.5 L 498.5 523.5 Z M 894.5 544.5 L 915.5 544.5 L 915.5 548.5 L 894.5 548.5 Z M 1573.5 544.5 L 1594.5 544.5 L 1594.5 548.5 L 1573.5 548.5 Z M 894.5 548.5 L 915.5 548.5 L 915.5 565.5 L 894.5 565.5 Z M 1573.5 548.5 L 1594.5 548.5 L 1594.5 565.5 L 1573.5 565.5 Z M 442.5 544.5 L 463.5 544.5 L 463.5 565.5 L 442.5 565.5 Z M 1008.5 544.5 L 1029.5 544.5 L 1029.5 565.5 L 1008.5 565.5 Z M 1291.5 586.5 L 1312.5 586.5 L 1312.5 596.5 L 1291.5 596.5 Z M 1291.5 596.5 L 1312.5 596.5 L 1312.5 607.5 L 1291.5 607.5 Z M 952.5 586.5 L 973.5 586.5 L 973.5 607.5 L 952.5 607.5 Z M 611.5 586.5 L 632.5 586.5 L 632.5 607.5 L 611.5 607.5 Z M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 1682.5 690.5 L 1703.5 690.5 L 1703.5 711.5 L 1682.5 711.5 Z M 1625.5 690.5 L 1646.5 690.5 L 1646.5 711.5 L 1625.5 711.5 Z M 1569.5 690.5 L 1590.5 690.5 L 1590.5 711.5 L 1569.5 711.5 Z M 1513.5 690.5 L 1534.5 690.5 L 1534.5 711.5 L 1513.5 711.5 Z M 1456.5 690.5 L 1477.5 690.5 L 1477.5 711.5 L 1456.5 711.5 Z M 1400.5 690.5 L 1421.5 690.5 L 1421.5 711.5 L 1400.5 711.5 Z M 1343.5 690.5 L 1364.5 690.5 L 1364.5 711.5 L 1343.5 711.5 Z M 1287.5 690.5 L 1308.5 690.5 L 1308.5 711.5 L 1287.5 711.5 Z M 1231.5 690.5 L 1252.5 690.5 L 1252.5 711.5 L 1231.5 711.5 Z M 1174.5 690.5 L 1195.5 690.5 L 1195.5 711.5 L 1174.5 711.5 Z M 1118.5 690.5 L 1139.5 690.5 L 1139.5 711.5 L 1118.5 711.5 Z M 1062.5 690.5 L 1082.5 690.5 L 1082.5 711.5 L 1062.5 711.5 Z M 1005.5 690.5 L 1026.5 690.5 L 1026.5 711.5 L 1005.5 711.5 Z M 949.5 690.5 L 970.5 690.5 L 970.5 711.5 L 949.5 711.5 Z M 892.5 690.5 L 913.5 690.5 L 913.5 711.5 L 892.5 711.5 Z M 836.5 690.5 L 857.5 690.5 L 857.5 711.5 L 836.5 711.5 Z M 780.5 690.5 L 800.5 690.5 L 800.5 711.5 L 780.5 711.5 Z M 723.5 690.5 L 744.5 690.5 L 744.5 711.5 L 723.5 711.5 Z M 667.5 690.5 L 688.5 690.5 L 688.5 711.5 L 667.5 711.5 Z M 610.5 690.5 L 631.5 690.5 L 631.5 711.5 L 610.5 711.5 Z M 554.5 690.5 L 575.5 690.5 L 575.5 711.5 L 554.5 711.5 Z M 498.5 690.5 L 518.5 690.5 L 518.5 711.5 L 498.5 711.5 Z M 441.5 690.5 L 462.5 690.5 L 462.5 711.5 L 441.5 711.5 Z M 385.5 690.5 L 406.5 690.5 L 406.5 711.5 L 385.5 711.5 Z M 328.5 690.5 L 349.5 690.5 L 349.5 711.5 L 328.5 711.5 Z M 272.5 690.5 L 293.5 690.5 L 293.5 711.5 L 272.5 711.5 Z M 272.5 690.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 216 722 L 236 722 M 216 701 L 236 701 M 216 701 L 216 722 M 236 701 L 236 722 " 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 216 722 L 236 722 M 216 701 L 236 701 M 236 722 L 236 701 M 216 722 L 216 701 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1686 493 L 1707 493 M 1686 472 L 1707 472 M 1686 472 L 1686 493 M 1707 472 L 1707 493 M 1573 660 L 1594 660 M 1573 639 L 1594 639 M 1573 639 L 1573 660 M 1594 639 L 1594 660 M 1686 660 L 1707 660 M 1686 639 L 1707 639 M 1686 639 L 1686 660 M 1707 639 L 1707 660 M 1686 618 L 1707 618 M 1686 597 L 1707 597 M 1686 597 L 1686 618 M 1707 597 L 1707 618 M 1686 576 L 1707 576 M 1686 556 L 1707 556 M 1686 556 L 1686 576 M 1707 556 L 1707 576 M 1686 451 L 1707 451 M 1686 431 L 1707 431 M 1686 431 L 1686 451 M 1707 431 L 1707 451 M 198 375 L 198 380 M 195 378 L 200 378 " 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 198 373 L 198 382 M 193 378 L 202 378 M 197 379 L 199 379 M 197 377 L 199 377 M 197 377 L 197 379 M 199 377 L 199 379 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.svg b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.svg
index fcc18a1..af0548f 100644
--- a/cells/fahcin/sky130_fd_sc_hd__fahcin_1.svg
+++ b/cells/fahcin/sky130_fd_sc_hd__fahcin_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 344.5 L 1744.5 344.5 L 1744.5 541.5 L 175.5 541.5 Z M 175.5 344.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" 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="#image303"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 216.5 690.5 "/>
 </clipPath>
 <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="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1592.5 592.5 L 1611.5 592.5 L 1611.5 671.5 L 1592.5 671.5 Z M 1419.5 592.5 L 1437.5 592.5 L 1437.5 671.5 L 1419.5 671.5 Z M 1001.5 592.5 L 1020.5 592.5 L 1020.5 671.5 L 1001.5 671.5 Z M 879.5 592.5 L 898.5 592.5 L 898.5 671.5 L 879.5 671.5 Z M 445.5 592.5 L 464.5 592.5 L 464.5 671.5 L 445.5 671.5 Z M 1243.5 592.5 L 1261.5 592.5 L 1261.5 671.5 L 1243.5 671.5 Z M 703.5 592.5 L 721.5 592.5 L 721.5 671.5 L 703.5 671.5 Z M 1189.5 592.5 L 1207.5 592.5 L 1207.5 671.5 L 1189.5 671.5 Z M 498.5 592.5 L 516.5 592.5 L 516.5 671.5 L 498.5 671.5 Z M 1054.5 592.5 L 1072.5 592.5 L 1072.5 671.5 L 1054.5 671.5 Z M 247.5 593.5 L 265.5 593.5 L 265.5 672.5 L 247.5 672.5 Z M 817.5 592.5 L 835.5 592.5 L 835.5 672.5 L 817.5 672.5 Z M 1477.5 592.5 L 1495.5 592.5 L 1495.5 672.5 L 1477.5 672.5 Z M 621.5 593.5 L 640.5 593.5 L 640.5 672.5 L 621.5 672.5 Z M 1651.5 592.5 L 1669.5 592.5 L 1669.5 672.5 L 1651.5 672.5 Z M 305.5 592.5 L 323.5 592.5 L 323.5 672.5 L 305.5 672.5 Z M 305.5 592.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 688.5 400.5 L 706.5 400.5 L 706.5 503.5 L 688.5 503.5 Z M 1284.5 405.5 L 1302.5 405.5 L 1302.5 507.5 L 1284.5 507.5 Z M 1233.5 405.5 L 1251.5 405.5 L 1251.5 507.5 L 1233.5 507.5 Z M 1046.5 416.5 L 1065.5 416.5 L 1065.5 519.5 L 1046.5 519.5 Z M 628.5 416.5 L 647.5 416.5 L 647.5 519.5 L 628.5 519.5 Z M 995.5 416.5 L 1013.5 416.5 L 1013.5 519.5 L 995.5 519.5 Z M 247.5 396.5 L 265.5 396.5 L 265.5 519.5 L 247.5 519.5 Z M 1423.5 396.5 L 1441.5 396.5 L 1441.5 519.5 L 1423.5 519.5 Z M 1644.5 396.5 L 1662.5 396.5 L 1662.5 519.5 L 1644.5 519.5 Z M 879.5 396.5 L 898.5 396.5 L 898.5 519.5 L 879.5 519.5 Z M 817.5 396.5 L 835.5 396.5 L 835.5 519.5 L 817.5 519.5 Z M 1474.5 396.5 L 1492.5 396.5 L 1492.5 519.5 L 1474.5 519.5 Z M 498.5 416.5 L 516.5 416.5 L 516.5 519.5 L 498.5 519.5 Z M 308.5 396.5 L 327.5 396.5 L 327.5 519.5 L 308.5 519.5 Z M 1592.5 396.5 L 1611.5 396.5 L 1611.5 519.5 L 1592.5 519.5 Z M 445.5 416.5 L 464.5 416.5 L 464.5 519.5 L 445.5 519.5 Z M 445.5 416.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 357.5 L 236.5 357.5 L 236.5 378.5 L 216.5 378.5 Z M 1682.5 357.5 L 1703.5 357.5 L 1703.5 378.5 L 1682.5 378.5 Z M 1625.5 357.5 L 1646.5 357.5 L 1646.5 378.5 L 1625.5 378.5 Z M 1569.5 357.5 L 1590.5 357.5 L 1590.5 378.5 L 1569.5 378.5 Z M 1513.5 357.5 L 1534.5 357.5 L 1534.5 378.5 L 1513.5 378.5 Z M 1456.5 357.5 L 1477.5 357.5 L 1477.5 378.5 L 1456.5 378.5 Z M 1400.5 357.5 L 1421.5 357.5 L 1421.5 378.5 L 1400.5 378.5 Z M 1343.5 357.5 L 1364.5 357.5 L 1364.5 378.5 L 1343.5 378.5 Z M 1287.5 357.5 L 1308.5 357.5 L 1308.5 378.5 L 1287.5 378.5 Z M 1231.5 357.5 L 1252.5 357.5 L 1252.5 378.5 L 1231.5 378.5 Z M 1174.5 357.5 L 1195.5 357.5 L 1195.5 378.5 L 1174.5 378.5 Z M 1118.5 357.5 L 1139.5 357.5 L 1139.5 378.5 L 1118.5 378.5 Z M 1062.5 357.5 L 1082.5 357.5 L 1082.5 378.5 L 1062.5 378.5 Z M 1005.5 357.5 L 1026.5 357.5 L 1026.5 378.5 L 1005.5 378.5 Z M 949.5 357.5 L 970.5 357.5 L 970.5 378.5 L 949.5 378.5 Z M 892.5 357.5 L 913.5 357.5 L 913.5 378.5 L 892.5 378.5 Z M 836.5 357.5 L 857.5 357.5 L 857.5 378.5 L 836.5 378.5 Z M 780.5 357.5 L 800.5 357.5 L 800.5 378.5 L 780.5 378.5 Z M 723.5 357.5 L 744.5 357.5 L 744.5 378.5 L 723.5 378.5 Z M 667.5 357.5 L 688.5 357.5 L 688.5 378.5 L 667.5 378.5 Z M 610.5 357.5 L 631.5 357.5 L 631.5 378.5 L 610.5 378.5 Z M 554.5 357.5 L 575.5 357.5 L 575.5 378.5 L 554.5 378.5 Z M 498.5 357.5 L 518.5 357.5 L 518.5 378.5 L 498.5 378.5 Z M 441.5 357.5 L 462.5 357.5 L 462.5 378.5 L 441.5 378.5 Z M 385.5 357.5 L 406.5 357.5 L 406.5 378.5 L 385.5 378.5 Z M 328.5 357.5 L 349.5 357.5 L 349.5 378.5 L 328.5 378.5 Z M 272.5 357.5 L 293.5 357.5 L 293.5 378.5 L 272.5 378.5 Z M 705.5 461.5 L 726.5 461.5 L 726.5 468.5 L 705.5 468.5 Z M 513.5 461.5 L 534.5 461.5 L 534.5 471.5 L 513.5 471.5 Z M 428.5 461.5 L 449.5 461.5 L 449.5 482.5 L 428.5 482.5 Z M 513.5 471.5 L 534.5 471.5 L 534.5 482.5 L 513.5 482.5 Z M 705.5 468.5 L 726.5 468.5 L 726.5 482.5 L 705.5 482.5 Z M 781.5 503.5 L 802.5 503.5 L 802.5 510.5 L 781.5 510.5 Z M 1233.5 503.5 L 1253.5 503.5 L 1253.5 523.5 L 1233.5 523.5 Z M 1630.5 503.5 L 1651.5 503.5 L 1651.5 523.5 L 1630.5 523.5 Z M 781.5 510.5 L 802.5 510.5 L 802.5 523.5 L 781.5 523.5 Z M 559.5 503.5 L 580.5 503.5 L 580.5 523.5 L 559.5 523.5 Z M 1289.5 544.5 L 1310.5 544.5 L 1310.5 548.5 L 1289.5 548.5 Z M 951.5 544.5 L 971.5 544.5 L 971.5 548.5 L 951.5 548.5 Z M 951.5 548.5 L 971.5 548.5 L 971.5 565.5 L 951.5 565.5 Z M 1289.5 548.5 L 1310.5 548.5 L 1310.5 565.5 L 1289.5 565.5 Z M 441.5 544.5 L 462.5 544.5 L 462.5 565.5 L 441.5 565.5 Z M 385.5 586.5 L 406.5 586.5 L 406.5 607.5 L 385.5 607.5 Z M 1573.5 586.5 L 1594.5 586.5 L 1594.5 607.5 L 1573.5 607.5 Z M 1120.5 586.5 L 1141.5 586.5 L 1141.5 607.5 L 1120.5 607.5 Z M 723.5 586.5 L 744.5 586.5 L 744.5 607.5 L 723.5 607.5 Z M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 1682.5 690.5 L 1703.5 690.5 L 1703.5 711.5 L 1682.5 711.5 Z M 1625.5 690.5 L 1646.5 690.5 L 1646.5 711.5 L 1625.5 711.5 Z M 1569.5 690.5 L 1590.5 690.5 L 1590.5 711.5 L 1569.5 711.5 Z M 1513.5 690.5 L 1534.5 690.5 L 1534.5 711.5 L 1513.5 711.5 Z M 1456.5 690.5 L 1477.5 690.5 L 1477.5 711.5 L 1456.5 711.5 Z M 1400.5 690.5 L 1421.5 690.5 L 1421.5 711.5 L 1400.5 711.5 Z M 1343.5 690.5 L 1364.5 690.5 L 1364.5 711.5 L 1343.5 711.5 Z M 1287.5 690.5 L 1308.5 690.5 L 1308.5 711.5 L 1287.5 711.5 Z M 1231.5 690.5 L 1252.5 690.5 L 1252.5 711.5 L 1231.5 711.5 Z M 1174.5 690.5 L 1195.5 690.5 L 1195.5 711.5 L 1174.5 711.5 Z M 1118.5 690.5 L 1139.5 690.5 L 1139.5 711.5 L 1118.5 711.5 Z M 1062.5 690.5 L 1082.5 690.5 L 1082.5 711.5 L 1062.5 711.5 Z M 1005.5 690.5 L 1026.5 690.5 L 1026.5 711.5 L 1005.5 711.5 Z M 949.5 690.5 L 970.5 690.5 L 970.5 711.5 L 949.5 711.5 Z M 892.5 690.5 L 913.5 690.5 L 913.5 711.5 L 892.5 711.5 Z M 836.5 690.5 L 857.5 690.5 L 857.5 711.5 L 836.5 711.5 Z M 780.5 690.5 L 800.5 690.5 L 800.5 711.5 L 780.5 711.5 Z M 723.5 690.5 L 744.5 690.5 L 744.5 711.5 L 723.5 711.5 Z M 667.5 690.5 L 688.5 690.5 L 688.5 711.5 L 667.5 711.5 Z M 610.5 690.5 L 631.5 690.5 L 631.5 711.5 L 610.5 711.5 Z M 554.5 690.5 L 575.5 690.5 L 575.5 711.5 L 554.5 711.5 Z M 498.5 690.5 L 518.5 690.5 L 518.5 711.5 L 498.5 711.5 Z M 441.5 690.5 L 462.5 690.5 L 462.5 711.5 L 441.5 711.5 Z M 385.5 690.5 L 406.5 690.5 L 406.5 711.5 L 385.5 711.5 Z M 328.5 690.5 L 349.5 690.5 L 349.5 711.5 L 328.5 711.5 Z M 272.5 690.5 L 293.5 690.5 L 293.5 711.5 L 272.5 711.5 Z M 272.5 690.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,5 @@
 <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 216 722 L 236 722 M 216 701 L 236 701 M 216 701 L 216 722 M 236 701 L 236 722 " 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 216 722 L 236 722 M 216 701 L 236 701 M 236 722 L 236 701 M 216 722 L 216 701 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1007 493 L 1028 493 M 1007 472 L 1028 472 M 1007 472 L 1007 493 M 1028 472 L 1028 493 M 1686 451 L 1707 451 M 1686 431 L 1707 431 M 1686 431 L 1686 451 M 1707 431 L 1707 451 M 1686 493 L 1707 493 M 1686 472 L 1707 472 M 1686 472 L 1686 493 M 1707 472 L 1707 493 M 1686 576 L 1707 576 M 1686 556 L 1707 556 M 1686 556 L 1686 576 M 1707 556 L 1707 576 M 1686 618 L 1707 618 M 1686 597 L 1707 597 M 1686 597 L 1686 618 M 1707 597 L 1707 618 M 1686 660 L 1707 660 M 1686 639 L 1707 639 M 1686 639 L 1686 660 M 1707 639 L 1707 660 M 198 375 L 198 380 M 195 378 L 200 378 " 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 198 373 L 198 382 M 193 378 L 202 378 M 197 379 L 199 379 M 197 377 L 199 377 M 197 377 L 197 379 M 199 377 L 199 379 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.svg b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.svg
index b341e0d..72a08ef 100644
--- a/cells/fahcon/sky130_fd_sc_hd__fahcon_1.svg
+++ b/cells/fahcon/sky130_fd_sc_hd__fahcon_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 344.5 L 1744.5 344.5 L 1744.5 541.5 L 175.5 541.5 Z M 175.5 344.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 216.5 690.5 "/>
 </clipPath>
 <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="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1594.5 592.5 L 1612.5 592.5 L 1612.5 671.5 L 1594.5 671.5 Z M 1420.5 592.5 L 1438.5 592.5 L 1438.5 671.5 L 1420.5 671.5 Z M 1003.5 592.5 L 1021.5 592.5 L 1021.5 671.5 L 1003.5 671.5 Z M 881.5 592.5 L 899.5 592.5 L 899.5 671.5 L 881.5 671.5 Z M 445.5 592.5 L 464.5 592.5 L 464.5 671.5 L 445.5 671.5 Z M 1282.5 592.5 L 1300.5 592.5 L 1300.5 671.5 L 1282.5 671.5 Z M 706.5 592.5 L 724.5 592.5 L 724.5 671.5 L 706.5 671.5 Z M 1228.5 592.5 L 1246.5 592.5 L 1246.5 671.5 L 1228.5 671.5 Z M 497.5 592.5 L 515.5 592.5 L 515.5 671.5 L 497.5 671.5 Z M 1055.5 592.5 L 1073.5 592.5 L 1073.5 671.5 L 1055.5 671.5 Z M 247.5 593.5 L 265.5 593.5 L 265.5 672.5 L 247.5 672.5 Z M 821.5 592.5 L 839.5 592.5 L 839.5 672.5 L 821.5 672.5 Z M 1478.5 592.5 L 1497.5 592.5 L 1497.5 672.5 L 1478.5 672.5 Z M 624.5 593.5 L 643.5 593.5 L 643.5 672.5 L 624.5 672.5 Z M 1652.5 592.5 L 1670.5 592.5 L 1670.5 672.5 L 1652.5 672.5 Z M 305.5 592.5 L 323.5 592.5 L 323.5 672.5 L 305.5 672.5 Z M 305.5 592.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image334"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 689.5 400.5 L 708.5 400.5 L 708.5 503.5 L 689.5 503.5 Z M 1285.5 405.5 L 1304.5 405.5 L 1304.5 507.5 L 1285.5 507.5 Z M 1234.5 405.5 L 1252.5 405.5 L 1252.5 507.5 L 1234.5 507.5 Z M 1047.5 416.5 L 1066.5 416.5 L 1066.5 519.5 L 1047.5 519.5 Z M 630.5 416.5 L 648.5 416.5 L 648.5 519.5 L 630.5 519.5 Z M 996.5 416.5 L 1014.5 416.5 L 1014.5 519.5 L 996.5 519.5 Z M 247.5 396.5 L 265.5 396.5 L 265.5 519.5 L 247.5 519.5 Z M 1424.5 396.5 L 1442.5 396.5 L 1442.5 519.5 L 1424.5 519.5 Z M 1645.5 396.5 L 1663.5 396.5 L 1663.5 519.5 L 1645.5 519.5 Z M 881.5 396.5 L 899.5 396.5 L 899.5 519.5 L 881.5 519.5 Z M 818.5 396.5 L 837.5 396.5 L 837.5 519.5 L 818.5 519.5 Z M 1475.5 396.5 L 1494.5 396.5 L 1494.5 519.5 L 1475.5 519.5 Z M 497.5 416.5 L 515.5 416.5 L 515.5 519.5 L 497.5 519.5 Z M 308.5 396.5 L 327.5 396.5 L 327.5 519.5 L 308.5 519.5 Z M 1594.5 396.5 L 1612.5 396.5 L 1612.5 519.5 L 1594.5 519.5 Z M 445.5 416.5 L 464.5 416.5 L 464.5 519.5 L 445.5 519.5 Z M 445.5 416.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 357.5 L 236.5 357.5 L 236.5 378.5 L 216.5 378.5 Z M 1682.5 357.5 L 1703.5 357.5 L 1703.5 378.5 L 1682.5 378.5 Z M 1625.5 357.5 L 1646.5 357.5 L 1646.5 378.5 L 1625.5 378.5 Z M 1569.5 357.5 L 1590.5 357.5 L 1590.5 378.5 L 1569.5 378.5 Z M 1513.5 357.5 L 1534.5 357.5 L 1534.5 378.5 L 1513.5 378.5 Z M 1456.5 357.5 L 1477.5 357.5 L 1477.5 378.5 L 1456.5 378.5 Z M 1400.5 357.5 L 1421.5 357.5 L 1421.5 378.5 L 1400.5 378.5 Z M 1343.5 357.5 L 1364.5 357.5 L 1364.5 378.5 L 1343.5 378.5 Z M 1287.5 357.5 L 1308.5 357.5 L 1308.5 378.5 L 1287.5 378.5 Z M 1231.5 357.5 L 1252.5 357.5 L 1252.5 378.5 L 1231.5 378.5 Z M 1174.5 357.5 L 1195.5 357.5 L 1195.5 378.5 L 1174.5 378.5 Z M 1118.5 357.5 L 1139.5 357.5 L 1139.5 378.5 L 1118.5 378.5 Z M 1062.5 357.5 L 1082.5 357.5 L 1082.5 378.5 L 1062.5 378.5 Z M 1005.5 357.5 L 1026.5 357.5 L 1026.5 378.5 L 1005.5 378.5 Z M 949.5 357.5 L 970.5 357.5 L 970.5 378.5 L 949.5 378.5 Z M 892.5 357.5 L 913.5 357.5 L 913.5 378.5 L 892.5 378.5 Z M 836.5 357.5 L 857.5 357.5 L 857.5 378.5 L 836.5 378.5 Z M 780.5 357.5 L 800.5 357.5 L 800.5 378.5 L 780.5 378.5 Z M 723.5 357.5 L 744.5 357.5 L 744.5 378.5 L 723.5 378.5 Z M 667.5 357.5 L 688.5 357.5 L 688.5 378.5 L 667.5 378.5 Z M 610.5 357.5 L 631.5 357.5 L 631.5 378.5 L 610.5 378.5 Z M 554.5 357.5 L 575.5 357.5 L 575.5 378.5 L 554.5 378.5 Z M 498.5 357.5 L 518.5 357.5 L 518.5 378.5 L 498.5 378.5 Z M 441.5 357.5 L 462.5 357.5 L 462.5 378.5 L 441.5 378.5 Z M 385.5 357.5 L 406.5 357.5 L 406.5 378.5 L 385.5 378.5 Z M 328.5 357.5 L 349.5 357.5 L 349.5 378.5 L 328.5 378.5 Z M 272.5 357.5 L 293.5 357.5 L 293.5 378.5 L 272.5 378.5 Z M 714.5 461.5 L 735.5 461.5 L 735.5 474.5 L 714.5 474.5 Z M 714.5 474.5 L 735.5 474.5 L 735.5 482.5 L 714.5 482.5 Z M 1336.5 461.5 L 1356.5 461.5 L 1356.5 482.5 L 1336.5 482.5 Z M 355.5 461.5 L 376.5 461.5 L 376.5 482.5 L 355.5 482.5 Z M 1447.5 461.5 L 1468.5 461.5 L 1468.5 482.5 L 1447.5 482.5 Z M 783.5 503.5 L 803.5 503.5 L 803.5 510.5 L 783.5 510.5 Z M 557.5 503.5 L 578.5 503.5 L 578.5 523.5 L 557.5 523.5 Z M 1234.5 503.5 L 1255.5 503.5 L 1255.5 523.5 L 1234.5 523.5 Z M 783.5 510.5 L 803.5 510.5 L 803.5 523.5 L 783.5 523.5 Z M 1631.5 503.5 L 1652.5 503.5 L 1652.5 523.5 L 1631.5 523.5 Z M 1290.5 544.5 L 1311.5 544.5 L 1311.5 548.5 L 1290.5 548.5 Z M 952.5 544.5 L 973.5 544.5 L 973.5 548.5 L 952.5 548.5 Z M 952.5 548.5 L 973.5 548.5 L 973.5 565.5 L 952.5 565.5 Z M 1290.5 548.5 L 1311.5 548.5 L 1311.5 565.5 L 1290.5 565.5 Z M 441.5 544.5 L 462.5 544.5 L 462.5 565.5 L 441.5 565.5 Z M 726.5 586.5 L 747.5 586.5 L 747.5 607.5 L 726.5 607.5 Z M 1575.5 586.5 L 1595.5 586.5 L 1595.5 607.5 L 1575.5 607.5 Z M 385.5 586.5 L 406.5 586.5 L 406.5 607.5 L 385.5 607.5 Z M 1121.5 586.5 L 1142.5 586.5 L 1142.5 607.5 L 1121.5 607.5 Z M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 1682.5 690.5 L 1703.5 690.5 L 1703.5 711.5 L 1682.5 711.5 Z M 1625.5 690.5 L 1646.5 690.5 L 1646.5 711.5 L 1625.5 711.5 Z M 1569.5 690.5 L 1590.5 690.5 L 1590.5 711.5 L 1569.5 711.5 Z M 1513.5 690.5 L 1534.5 690.5 L 1534.5 711.5 L 1513.5 711.5 Z M 1456.5 690.5 L 1477.5 690.5 L 1477.5 711.5 L 1456.5 711.5 Z M 1400.5 690.5 L 1421.5 690.5 L 1421.5 711.5 L 1400.5 711.5 Z M 1343.5 690.5 L 1364.5 690.5 L 1364.5 711.5 L 1343.5 711.5 Z M 1287.5 690.5 L 1308.5 690.5 L 1308.5 711.5 L 1287.5 711.5 Z M 1231.5 690.5 L 1252.5 690.5 L 1252.5 711.5 L 1231.5 711.5 Z M 1174.5 690.5 L 1195.5 690.5 L 1195.5 711.5 L 1174.5 711.5 Z M 1118.5 690.5 L 1139.5 690.5 L 1139.5 711.5 L 1118.5 711.5 Z M 1062.5 690.5 L 1082.5 690.5 L 1082.5 711.5 L 1062.5 711.5 Z M 1005.5 690.5 L 1026.5 690.5 L 1026.5 711.5 L 1005.5 711.5 Z M 949.5 690.5 L 970.5 690.5 L 970.5 711.5 L 949.5 711.5 Z M 892.5 690.5 L 913.5 690.5 L 913.5 711.5 L 892.5 711.5 Z M 836.5 690.5 L 857.5 690.5 L 857.5 711.5 L 836.5 711.5 Z M 780.5 690.5 L 800.5 690.5 L 800.5 711.5 L 780.5 711.5 Z M 723.5 690.5 L 744.5 690.5 L 744.5 711.5 L 723.5 711.5 Z M 667.5 690.5 L 688.5 690.5 L 688.5 711.5 L 667.5 711.5 Z M 610.5 690.5 L 631.5 690.5 L 631.5 711.5 L 610.5 711.5 Z M 554.5 690.5 L 575.5 690.5 L 575.5 711.5 L 554.5 711.5 Z M 498.5 690.5 L 518.5 690.5 L 518.5 711.5 L 498.5 711.5 Z M 441.5 690.5 L 462.5 690.5 L 462.5 711.5 L 441.5 711.5 Z M 385.5 690.5 L 406.5 690.5 L 406.5 711.5 L 385.5 711.5 Z M 328.5 690.5 L 349.5 690.5 L 349.5 711.5 L 328.5 711.5 Z M 272.5 690.5 L 293.5 690.5 L 293.5 711.5 L 272.5 711.5 Z M 272.5 690.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 216 722 L 236 722 M 216 701 L 236 701 M 216 701 L 216 722 M 236 701 L 236 722 " 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 216 722 L 236 722 M 216 701 L 236 701 M 236 722 L 236 701 M 216 722 L 216 701 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1687 451 L 1708 451 M 1687 431 L 1708 431 M 1687 431 L 1687 451 M 1708 431 L 1708 451 M 1687 493 L 1708 493 M 1687 472 L 1708 472 M 1687 472 L 1687 493 M 1708 472 L 1708 493 M 1687 576 L 1708 576 M 1687 556 L 1708 556 M 1687 556 L 1687 576 M 1708 556 L 1708 576 M 1687 618 L 1708 618 M 1687 597 L 1708 597 M 1687 597 L 1687 618 M 1708 597 L 1708 618 M 1687 660 L 1708 660 M 1687 639 L 1708 639 M 1687 639 L 1687 660 M 1708 639 L 1708 660 M 1008 493 L 1029 493 M 1008 472 L 1029 472 M 1008 472 L 1008 493 M 1029 472 L 1029 493 M 198 375 L 198 380 M 195 378 L 200 378 " 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 198 373 L 198 382 M 193 378 L 202 378 M 197 379 L 199 379 M 197 377 L 199 377 M 197 377 L 197 379 M 199 377 L 199 379 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hd__fill_1.svg b/cells/fill/sky130_fd_sc_hd__fill_1.svg
index 3398aaf..8d4943e 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_1.svg
+++ b/cells/fill/sky130_fd_sc_hd__fill_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 850.5 112.5 L 1080.5 112.5 L 1080.5 551.5 L 850.5 551.5 Z M 850.5 112.5 "/>
 </clipPath>
-<image id="image229" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image268" 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="#image229"/>
+  <use xlink:href="#image268"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 941.5 893.5 L 973.5 893.5 L 973.5 923.5 L 941.5 923.5 Z M 941.5 893.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image229"/>
+  <use xlink:href="#image268"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image269" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image269"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface226">
+<g id="surface265">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <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 941 186 L 973 186 M 941 156 L 973 156 M 941 156 L 941 186 M 973 156 L 973 186 " 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 941 186 L 973 186 M 941 156 L 973 156 M 973 186 L 973 156 M 941 186 L 941 156 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 167 L 902 174 M 898 171 L 905 171 " 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 902 166 L 902 175 M 897 171 L 906 171 M 901 172 L 903 172 M 901 170 L 903 170 M 901 170 L 901 172 M 903 170 L 903 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hd__fill_2.svg b/cells/fill/sky130_fd_sc_hd__fill_2.svg
index e0e8df4..429ad1a 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_2.svg
+++ b/cells/fill/sky130_fd_sc_hd__fill_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 787.5 112.5 L 1143.5 112.5 L 1143.5 551.5 L 787.5 551.5 Z M 787.5 112.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image271" 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="#image230"/>
+  <use xlink:href="#image271"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 882.5 892.5 L 925.5 892.5 L 925.5 922.5 L 882.5 922.5 Z M 882.5 892.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image271"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 879.5 141.5 L 925.5 141.5 L 925.5 187.5 L 879.5 187.5 Z M 1005.5 141.5 L 1051.5 141.5 L 1051.5 187.5 L 1005.5 187.5 Z M 879.5 885.5 L 925.5 885.5 L 925.5 931.5 L 879.5 931.5 Z M 1005.5 885.5 L 1051.5 885.5 L 1051.5 931.5 L 1005.5 931.5 Z M 1005.5 885.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image272"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface268">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <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 882 187 L 925 187 M 882 157 L 925 157 M 882 157 L 882 187 M 925 157 L 925 187 " 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 882 187 L 925 187 M 882 157 L 925 157 M 925 187 L 925 157 M 882 187 L 882 157 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 839 167 L 839 174 M 835 171 L 842 171 " 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 839 166 L 839 175 M 834 171 L 843 171 M 838 172 L 840 172 M 838 170 L 840 170 M 838 170 L 838 172 M 840 170 L 840 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hd__fill_4.svg b/cells/fill/sky130_fd_sc_hd__fill_4.svg
index 3c207e4..2e37a0e 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_4.svg
+++ b/cells/fill/sky130_fd_sc_hd__fill_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image257" 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="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 760.5 892.5 L 790.5 892.5 L 790.5 925.5 L 760.5 925.5 Z M 760.5 892.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image258" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image258"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface254">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <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 760 187 L 790 187 M 760 154 L 790 154 M 760 154 L 760 187 M 790 154 L 790 187 " 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 760 187 L 790 187 M 760 154 L 790 154 M 790 187 L 790 154 M 760 187 L 760 154 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hd__fill_8.svg b/cells/fill/sky130_fd_sc_hd__fill_8.svg
index be1a87e..d482388 100644
--- a/cells/fill/sky130_fd_sc_hd__fill_8.svg
+++ b/cells/fill/sky130_fd_sc_hd__fill_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image257" 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="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 493.5 894.5 L 553.5 894.5 L 553.5 941.5 L 493.5 941.5 Z M 493.5 894.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image258" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image258"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface254">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <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 493 185 L 553 185 M 493 138 L 553 138 M 493 138 L 493 185 M 553 138 L 553 185 " 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 493 185 L 553 185 M 493 138 L 553 138 M 553 185 L 553 138 M 493 185 L 493 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hd__ha_1.svg b/cells/ha/sky130_fd_sc_hd__ha_1.svg
index 02c5984..a6b1c20 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_1.svg
+++ b/cells/ha/sky130_fd_sc_hd__ha_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" 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="#image367"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 439.5 666.5 L 480.5 666.5 L 480.5 844.5 L 439.5 844.5 Z M 696.5 729.5 L 737.5 729.5 L 737.5 844.5 L 696.5 844.5 Z M 1310.5 729.5 L 1351.5 729.5 L 1351.5 844.5 L 1310.5 844.5 Z M 1211.5 729.5 L 1252.5 729.5 L 1252.5 844.5 L 1211.5 844.5 Z M 925.5 729.5 L 967.5 729.5 L 967.5 844.5 L 925.5 844.5 Z M 811.5 729.5 L 852.5 729.5 L 852.5 844.5 L 811.5 844.5 Z M 1440.5 666.5 L 1481.5 666.5 L 1481.5 844.5 L 1440.5 844.5 Z M 1440.5 666.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1310.5 228.5 L 1351.5 228.5 L 1351.5 343.5 L 1310.5 343.5 Z M 954.5 228.5 L 995.5 228.5 L 995.5 343.5 L 954.5 343.5 Z M 689.5 228.5 L 730.5 228.5 L 730.5 343.5 L 689.5 343.5 Z M 804.5 228.5 L 845.5 228.5 L 845.5 343.5 L 804.5 343.5 Z M 1189.5 228.5 L 1230.5 228.5 L 1230.5 343.5 L 1189.5 343.5 Z M 1440.5 228.5 L 1481.5 228.5 L 1481.5 502.5 L 1440.5 502.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 502.5 L 439.5 502.5 Z M 439.5 228.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface364">
+<g id="surface391">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,5 @@
 <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 873 613 L 920 613 M 873 566 L 920 566 M 873 566 L 873 613 M 920 566 L 920 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 873 613 L 920 613 M 873 566 L 920 566 M 920 613 L 920 566 M 873 613 L 873 566 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hd__ha_2.svg b/cells/ha/sky130_fd_sc_hd__ha_2.svg
index 4b8ec11..5a5fe6f 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_2.svg
+++ b/cells/ha/sky130_fd_sc_hd__ha_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image365" 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="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 703.5 723.5 L 743.5 723.5 L 743.5 835.5 L 703.5 835.5 Z M 815.5 723.5 L 855.5 723.5 L 855.5 835.5 L 815.5 835.5 Z M 1300.5 723.5 L 1340.5 723.5 L 1340.5 835.5 L 1300.5 835.5 Z M 1205.5 723.5 L 1244.5 723.5 L 1244.5 835.5 L 1205.5 835.5 Z M 927.5 723.5 L 967.5 723.5 L 967.5 835.5 L 927.5 835.5 Z M 1427.5 662.5 L 1467.5 662.5 L 1467.5 835.5 L 1427.5 835.5 Z M 1549.5 662.5 L 1589.5 662.5 L 1589.5 835.5 L 1549.5 835.5 Z M 453.5 662.5 L 493.5 662.5 L 493.5 835.5 L 453.5 835.5 Z M 453.5 662.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1300.5 237.5 L 1340.5 237.5 L 1340.5 407.5 L 1300.5 407.5 Z M 1183.5 237.5 L 1223.5 237.5 L 1223.5 407.5 L 1183.5 407.5 Z M 955.5 237.5 L 994.5 237.5 L 994.5 407.5 L 955.5 407.5 Z M 697.5 237.5 L 736.5 237.5 L 736.5 407.5 L 697.5 407.5 Z M 808.5 237.5 L 848.5 237.5 L 848.5 407.5 L 808.5 407.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 1427.5 237.5 L 1467.5 237.5 L 1467.5 503.5 L 1427.5 503.5 Z M 1549.5 237.5 L 1589.5 237.5 L 1589.5 503.5 L 1549.5 503.5 Z M 453.5 237.5 L 493.5 237.5 L 493.5 503.5 L 453.5 503.5 Z M 453.5 237.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -194,6 +194,5 @@
 <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 876 520 L 921 520 M 876 475 L 921 475 M 876 475 L 876 520 M 921 475 L 921 520 " 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 876 520 L 921 520 M 876 475 L 921 475 M 921 520 L 921 475 M 876 520 L 876 475 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hd__ha_4.svg b/cells/ha/sky130_fd_sc_hd__ha_4.svg
index 36ccc67..62edd3e 100644
--- a/cells/ha/sky130_fd_sc_hd__ha_4.svg
+++ b/cells/ha/sky130_fd_sc_hd__ha_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image401" 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="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 230.5 743.5 L 258.5 743.5 L 258.5 771.5 L 230.5 771.5 Z M 230.5 743.5 "/>
 </clipPath>
 <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="#image429"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1624.5 612.5 L 1648.5 612.5 L 1648.5 719.5 L 1624.5 719.5 Z M 270.5 612.5 L 295.5 612.5 L 295.5 719.5 L 270.5 719.5 Z M 339.5 612.5 L 364.5 612.5 L 364.5 719.5 L 339.5 719.5 Z M 408.5 612.5 L 432.5 612.5 L 432.5 719.5 L 408.5 719.5 Z M 477.5 612.5 L 501.5 612.5 L 501.5 719.5 L 477.5 719.5 Z M 631.5 612.5 L 655.5 612.5 L 655.5 719.5 L 631.5 719.5 Z M 699.5 612.5 L 724.5 612.5 L 724.5 719.5 L 699.5 719.5 Z M 768.5 612.5 L 793.5 612.5 L 793.5 719.5 L 768.5 719.5 Z M 841.5 612.5 L 866.5 612.5 L 866.5 719.5 L 841.5 719.5 Z M 910.5 612.5 L 935.5 612.5 L 935.5 719.5 L 910.5 719.5 Z M 1068.5 612.5 L 1093.5 612.5 L 1093.5 719.5 L 1068.5 719.5 Z M 1137.5 612.5 L 1161.5 612.5 L 1161.5 719.5 L 1137.5 719.5 Z M 1198.5 612.5 L 1222.5 612.5 L 1222.5 719.5 L 1198.5 719.5 Z M 1266.5 612.5 L 1291.5 612.5 L 1291.5 719.5 L 1266.5 719.5 Z M 1335.5 612.5 L 1360.5 612.5 L 1360.5 719.5 L 1335.5 719.5 Z M 1417.5 612.5 L 1442.5 612.5 L 1442.5 719.5 L 1417.5 719.5 Z M 1486.5 612.5 L 1510.5 612.5 L 1510.5 719.5 L 1486.5 719.5 Z M 1555.5 612.5 L 1579.5 612.5 L 1579.5 719.5 L 1555.5 719.5 Z M 1555.5 612.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image430"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1624.5 350.5 L 1648.5 350.5 L 1648.5 514.5 L 1624.5 514.5 Z M 270.5 350.5 L 295.5 350.5 L 295.5 514.5 L 270.5 514.5 Z M 339.5 350.5 L 364.5 350.5 L 364.5 514.5 L 339.5 514.5 Z M 408.5 350.5 L 432.5 350.5 L 432.5 514.5 L 408.5 514.5 Z M 477.5 350.5 L 501.5 350.5 L 501.5 514.5 L 477.5 514.5 Z M 627.5 350.5 L 651.5 350.5 L 651.5 514.5 L 627.5 514.5 Z M 695.5 350.5 L 720.5 350.5 L 720.5 514.5 L 695.5 514.5 Z M 768.5 350.5 L 793.5 350.5 L 793.5 514.5 L 768.5 514.5 Z M 841.5 350.5 L 866.5 350.5 L 866.5 514.5 L 841.5 514.5 Z M 910.5 350.5 L 935.5 350.5 L 935.5 514.5 L 910.5 514.5 Z M 1029.5 350.5 L 1053.5 350.5 L 1053.5 514.5 L 1029.5 514.5 Z M 1129.5 350.5 L 1153.5 350.5 L 1153.5 514.5 L 1129.5 514.5 Z M 1198.5 350.5 L 1222.5 350.5 L 1222.5 514.5 L 1198.5 514.5 Z M 1266.5 350.5 L 1291.5 350.5 L 1291.5 514.5 L 1266.5 514.5 Z M 1335.5 350.5 L 1360.5 350.5 L 1360.5 514.5 L 1335.5 514.5 Z M 1417.5 350.5 L 1442.5 350.5 L 1442.5 514.5 L 1417.5 514.5 Z M 1486.5 350.5 L 1510.5 350.5 L 1510.5 514.5 L 1486.5 514.5 Z M 1555.5 350.5 L 1579.5 350.5 L 1579.5 514.5 L 1555.5 514.5 Z M 1555.5 350.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image432"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface398">
+<g id="surface426">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -212,6 +212,5 @@
 <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 1585 586 L 1613 586 M 1585 558 L 1613 558 M 1585 558 L 1585 586 M 1613 558 L 1613 586 " 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 1585 586 L 1613 586 M 1585 558 L 1613 558 M 1613 586 L 1613 558 M 1585 586 L 1585 558 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_1.svg b/cells/inv/sky130_fd_sc_hd__inv_1.svg
index 87ad584..6391ac6 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_1.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image300" 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="#image273"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 941.5 666.5 L 982.5 666.5 L 982.5 844.5 L 941.5 844.5 Z M 941.5 666.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 941.5 228.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 816 938 L 863 938 M 816 892 L 863 892 M 816 892 L 816 938 M 863 892 L 863 938 " 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 816 938 L 863 938 M 816 892 L 863 892 M 863 938 L 863 892 M 816 938 L 816 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_12.svg b/cells/inv/sky130_fd_sc_hd__inv_12.svg
index 4f6c1d2..1a6890b 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_12.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" 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="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1499.5 653.5 L 1536.5 653.5 L 1536.5 813.5 L 1499.5 813.5 Z M 360.5 653.5 L 397.5 653.5 L 397.5 813.5 L 360.5 813.5 Z M 463.5 653.5 L 500.5 653.5 L 500.5 813.5 L 463.5 813.5 Z M 567.5 653.5 L 604.5 653.5 L 604.5 813.5 L 567.5 813.5 Z M 671.5 653.5 L 708.5 653.5 L 708.5 813.5 L 671.5 813.5 Z M 774.5 653.5 L 811.5 653.5 L 811.5 813.5 L 774.5 813.5 Z M 878.5 653.5 L 915.5 653.5 L 915.5 813.5 L 878.5 813.5 Z M 981.5 653.5 L 1018.5 653.5 L 1018.5 813.5 L 981.5 813.5 Z M 1085.5 653.5 L 1122.5 653.5 L 1122.5 813.5 L 1085.5 813.5 Z M 1188.5 653.5 L 1225.5 653.5 L 1225.5 813.5 L 1188.5 813.5 Z M 1292.5 653.5 L 1329.5 653.5 L 1329.5 813.5 L 1292.5 813.5 Z M 1396.5 653.5 L 1433.5 653.5 L 1433.5 813.5 L 1396.5 813.5 Z M 1396.5 653.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1499.5 258.5 L 1536.5 258.5 L 1536.5 505.5 L 1499.5 505.5 Z M 360.5 258.5 L 397.5 258.5 L 397.5 505.5 L 360.5 505.5 Z M 463.5 258.5 L 500.5 258.5 L 500.5 505.5 L 463.5 505.5 Z M 567.5 258.5 L 604.5 258.5 L 604.5 505.5 L 567.5 505.5 Z M 671.5 258.5 L 708.5 258.5 L 708.5 505.5 L 671.5 505.5 Z M 774.5 258.5 L 811.5 258.5 L 811.5 505.5 L 774.5 505.5 Z M 878.5 258.5 L 915.5 258.5 L 915.5 505.5 L 878.5 505.5 Z M 981.5 258.5 L 1018.5 258.5 L 1018.5 505.5 L 981.5 505.5 Z M 1085.5 258.5 L 1122.5 258.5 L 1122.5 505.5 L 1085.5 505.5 Z M 1188.5 258.5 L 1225.5 258.5 L 1225.5 505.5 L 1188.5 505.5 Z M 1292.5 258.5 L 1329.5 258.5 L 1329.5 505.5 L 1292.5 505.5 Z M 1396.5 258.5 L 1433.5 258.5 L 1433.5 505.5 L 1396.5 505.5 Z M 1396.5 258.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_16.svg b/cells/inv/sky130_fd_sc_hd__inv_16.svg
index d151262..ecae612 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_16.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1583.5 631.5 L 1613.5 631.5 L 1613.5 763.5 L 1583.5 763.5 Z M 305.5 631.5 L 336.5 631.5 L 336.5 763.5 L 305.5 763.5 Z M 391.5 631.5 L 421.5 631.5 L 421.5 763.5 L 391.5 763.5 Z M 476.5 631.5 L 506.5 631.5 L 506.5 763.5 L 476.5 763.5 Z M 561.5 631.5 L 591.5 631.5 L 591.5 763.5 L 561.5 763.5 Z M 646.5 631.5 L 677.5 631.5 L 677.5 763.5 L 646.5 763.5 Z M 731.5 631.5 L 762.5 631.5 L 762.5 763.5 L 731.5 763.5 Z M 816.5 631.5 L 847.5 631.5 L 847.5 763.5 L 816.5 763.5 Z M 902.5 631.5 L 932.5 631.5 L 932.5 763.5 L 902.5 763.5 Z M 987.5 631.5 L 1017.5 631.5 L 1017.5 763.5 L 987.5 763.5 Z M 1072.5 631.5 L 1102.5 631.5 L 1102.5 763.5 L 1072.5 763.5 Z M 1157.5 631.5 L 1188.5 631.5 L 1188.5 763.5 L 1157.5 763.5 Z M 1242.5 631.5 L 1273.5 631.5 L 1273.5 763.5 L 1242.5 763.5 Z M 1327.5 631.5 L 1358.5 631.5 L 1358.5 763.5 L 1327.5 763.5 Z M 1413.5 631.5 L 1443.5 631.5 L 1443.5 763.5 L 1413.5 763.5 Z M 1498.5 631.5 L 1528.5 631.5 L 1528.5 763.5 L 1498.5 763.5 Z M 1498.5 631.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1583.5 307.5 L 1613.5 307.5 L 1613.5 510.5 L 1583.5 510.5 Z M 305.5 307.5 L 336.5 307.5 L 336.5 510.5 L 305.5 510.5 Z M 391.5 307.5 L 421.5 307.5 L 421.5 510.5 L 391.5 510.5 Z M 476.5 307.5 L 506.5 307.5 L 506.5 510.5 L 476.5 510.5 Z M 561.5 307.5 L 591.5 307.5 L 591.5 510.5 L 561.5 510.5 Z M 646.5 307.5 L 677.5 307.5 L 677.5 510.5 L 646.5 510.5 Z M 731.5 307.5 L 762.5 307.5 L 762.5 510.5 L 731.5 510.5 Z M 816.5 307.5 L 847.5 307.5 L 847.5 510.5 L 816.5 510.5 Z M 902.5 307.5 L 932.5 307.5 L 932.5 510.5 L 902.5 510.5 Z M 987.5 307.5 L 1017.5 307.5 L 1017.5 510.5 L 987.5 510.5 Z M 1072.5 307.5 L 1102.5 307.5 L 1102.5 510.5 L 1072.5 510.5 Z M 1157.5 307.5 L 1188.5 307.5 L 1188.5 510.5 L 1157.5 510.5 Z M 1242.5 307.5 L 1273.5 307.5 L 1273.5 510.5 L 1242.5 510.5 Z M 1327.5 307.5 L 1358.5 307.5 L 1358.5 510.5 L 1327.5 510.5 Z M 1413.5 307.5 L 1443.5 307.5 L 1443.5 510.5 L 1413.5 510.5 Z M 1498.5 307.5 L 1528.5 307.5 L 1528.5 510.5 L 1498.5 510.5 Z M 1498.5 307.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <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 242 837 L 276 837 M 242 802 L 276 802 M 242 802 L 242 837 M 276 802 L 276 837 " 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 242 837 L 276 837 M 242 802 L 276 802 M 276 837 L 276 802 M 242 837 L 242 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 801 527 L 836 527 M 801 492 L 836 492 M 801 492 L 801 527 M 836 492 L 836 527 M 428 527 L 463 527 M 428 492 L 463 492 M 428 492 L 428 527 M 463 492 L 463 527 M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_2.svg b/cells/inv/sky130_fd_sc_hd__inv_2.svg
index 5d8b1d0..45c9f9e 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_2.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1002.5 666.5 L 1043.5 666.5 L 1043.5 844.5 L 1002.5 844.5 Z M 887.5 666.5 L 928.5 666.5 L 928.5 844.5 L 887.5 844.5 Z M 887.5 666.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1002.5 228.5 L 1043.5 228.5 L 1043.5 502.5 L 1002.5 502.5 Z M 887.5 228.5 L 928.5 228.5 L 928.5 502.5 L 887.5 502.5 Z M 887.5 228.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 816 194 L 863 194 M 816 148 L 863 148 M 816 148 L 816 194 M 863 148 L 863 194 " 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 816 194 L 863 194 M 816 148 L 863 148 M 863 194 L 863 148 M 816 194 L 816 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_4.svg b/cells/inv/sky130_fd_sc_hd__inv_4.svg
index 943c3c7..98e4290 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_4.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" 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="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1114.5 666.5 L 1155.5 666.5 L 1155.5 844.5 L 1114.5 844.5 Z M 770.5 666.5 L 811.5 666.5 L 811.5 844.5 L 770.5 844.5 Z M 884.5 666.5 L 925.5 666.5 L 925.5 844.5 L 884.5 844.5 Z M 999.5 666.5 L 1040.5 666.5 L 1040.5 844.5 L 999.5 844.5 Z M 999.5 666.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1114.5 228.5 L 1155.5 228.5 L 1155.5 502.5 L 1114.5 502.5 Z M 770.5 228.5 L 811.5 228.5 L 811.5 502.5 L 770.5 502.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 502.5 L 884.5 502.5 Z M 999.5 228.5 L 1040.5 228.5 L 1040.5 502.5 L 999.5 502.5 Z M 999.5 228.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 687 194 L 734 194 M 687 148 L 734 148 M 687 148 L 687 194 M 734 148 L 734 194 " 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 687 194 L 734 194 M 687 148 L 734 148 M 734 194 L 734 148 M 687 194 L 687 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_6.svg b/cells/inv/sky130_fd_sc_hd__inv_6.svg
index aeef1b1..622a124 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_6.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" 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="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1251.5 666.5 L 1292.5 666.5 L 1292.5 844.5 L 1251.5 844.5 Z M 677.5 666.5 L 718.5 666.5 L 718.5 844.5 L 677.5 844.5 Z M 791.5 666.5 L 832.5 666.5 L 832.5 844.5 L 791.5 844.5 Z M 906.5 666.5 L 947.5 666.5 L 947.5 844.5 L 906.5 844.5 Z M 1021.5 666.5 L 1062.5 666.5 L 1062.5 844.5 L 1021.5 844.5 Z M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 1136.5 666.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1251.5 228.5 L 1292.5 228.5 L 1292.5 502.5 L 1251.5 502.5 Z M 677.5 228.5 L 718.5 228.5 L 718.5 502.5 L 677.5 502.5 Z M 791.5 228.5 L 832.5 228.5 L 832.5 502.5 L 791.5 502.5 Z M 906.5 228.5 L 947.5 228.5 L 947.5 502.5 L 906.5 502.5 Z M 1021.5 228.5 L 1062.5 228.5 L 1062.5 502.5 L 1021.5 502.5 Z M 1136.5 228.5 L 1177.5 228.5 L 1177.5 502.5 L 1136.5 502.5 Z M 1136.5 228.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hd__inv_8.svg b/cells/inv/sky130_fd_sc_hd__inv_8.svg
index 6f32831..8e08774 100644
--- a/cells/inv/sky130_fd_sc_hd__inv_8.svg
+++ b/cells/inv/sky130_fd_sc_hd__inv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" 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="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1352.5 666.5 L 1393.5 666.5 L 1393.5 844.5 L 1352.5 844.5 Z M 548.5 666.5 L 589.5 666.5 L 589.5 844.5 L 548.5 844.5 Z M 663.5 666.5 L 704.5 666.5 L 704.5 844.5 L 663.5 844.5 Z M 778.5 666.5 L 819.5 666.5 L 819.5 844.5 L 778.5 844.5 Z M 893.5 666.5 L 934.5 666.5 L 934.5 844.5 L 893.5 844.5 Z M 1008.5 666.5 L 1049.5 666.5 L 1049.5 844.5 L 1008.5 844.5 Z M 1122.5 666.5 L 1163.5 666.5 L 1163.5 844.5 L 1122.5 844.5 Z M 1237.5 666.5 L 1278.5 666.5 L 1278.5 844.5 L 1237.5 844.5 Z M 1237.5 666.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1352.5 228.5 L 1393.5 228.5 L 1393.5 502.5 L 1352.5 502.5 Z M 548.5 228.5 L 589.5 228.5 L 589.5 502.5 L 548.5 502.5 Z M 663.5 228.5 L 704.5 228.5 L 704.5 502.5 L 663.5 502.5 Z M 778.5 228.5 L 819.5 228.5 L 819.5 502.5 L 778.5 502.5 Z M 893.5 228.5 L 934.5 228.5 L 934.5 502.5 L 893.5 502.5 Z M 1008.5 228.5 L 1049.5 228.5 L 1049.5 502.5 L 1008.5 502.5 Z M 1122.5 228.5 L 1163.5 228.5 L 1163.5 502.5 L 1122.5 502.5 Z M 1237.5 228.5 L 1278.5 228.5 L 1278.5 502.5 L 1237.5 502.5 Z M 1237.5 228.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.svg b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.svg
index f7045fb..25e1e14 100644
--- a/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.svg
+++ b/cells/lpflow_bleeder/sky130_fd_sc_hd__lpflow_bleeder_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image295" 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="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,9 +32,9 @@
 <clipPath id="clip6">
   <path d="M 1139.5 666.5 L 1180.5 666.5 L 1180.5 765.5 L 1139.5 765.5 Z M 745.5 666.5 L 786.5 666.5 L 786.5 765.5 L 745.5 765.5 Z M 843.5 666.5 L 884.5 666.5 L 884.5 765.5 L 843.5 765.5 Z M 942.5 666.5 L 983.5 666.5 L 983.5 765.5 L 942.5 765.5 Z M 1040.5 666.5 L 1081.5 666.5 L 1081.5 765.5 L 1040.5 765.5 Z M 1040.5 666.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -48,15 +48,15 @@
 <clipPath id="clip9">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image269" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image269"/>
+  <use xlink:href="#image297"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface264">
+<g id="surface292">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -120,6 +120,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 690.9375 925.402344 L 690.9375 890.640625 L 704.335938 890.640625 L 706.433594 890.785156 L 708.390625 891.164062 L 710.203125 891.832031 L 711.871094 892.691406 L 713.347656 893.882812 L 714.730469 895.265625 L 715.875 896.933594 L 716.828125 898.746094 L 717.542969 900.796875 L 718.070312 902.992188 L 718.355469 905.421875 L 718.5 907.996094 L 718.355469 910.714844 L 718.023438 913.242188 L 717.449219 915.53125 L 716.6875 917.628906 L 715.683594 919.488281 L 714.445312 921.113281 L 713.109375 922.445312 L 711.632812 923.496094 L 710.011719 924.355469 L 708.246094 924.925781 L 706.339844 925.308594 L 704.335938 925.402344 Z M 695.371094 921.492188 L 703.574219 921.492188 L 705.765625 921.351562 L 707.722656 920.824219 L 709.4375 919.917969 L 710.867188 918.726562 L 712.011719 917.105469 L 712.96875 915.152344 L 713.253906 914.148438 L 713.539062 913.101562 L 713.777344 911.957031 L 713.921875 910.714844 L 714.015625 909.429688 L 714.0625 908.046875 L 713.875 904.945312 L 713.394531 902.226562 L 712.539062 899.890625 L 711.394531 898.03125 L 709.914062 896.503906 L 708.101562 895.410156 L 707.433594 895.171875 L 706.71875 894.933594 L 705.195312 894.644531 L 704.382812 894.597656 L 703.574219 894.550781 L 695.371094 894.550781 Z M 695.371094 921.492188 "/>
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.svg b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.svg
index d535442..52f3ddf 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.svg
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 1068.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1005.5 702.5 L 1046.5 702.5 L 1046.5 844.5 L 1005.5 844.5 Z M 884.5 702.5 L 925.5 702.5 L 925.5 844.5 L 884.5 844.5 Z M 884.5 702.5 "/>
 </clipPath>
-<image id="image297" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1005.5 228.5 L 1046.5 228.5 L 1046.5 444.5 L 1005.5 444.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 444.5 L 884.5 444.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image298" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 943.5 280.5 L 990.5 280.5 L 990.5 302.5 L 943.5 302.5 Z M 943.5 302.5 L 990.5 302.5 L 990.5 327.5 L 943.5 327.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image299" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 1068 194 L 1114 194 M 1068 148 L 1114 148 M 1068 148 L 1068 194 M 1114 148 L 1114 194 " 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 1068 194 L 1114 194 M 1068 148 L 1114 148 M 1114 194 L 1114 148 M 1068 194 L 1068 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.svg b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.svg
index 3e6582d..fd09552 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.svg
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" 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="#image327"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 229.5 743.5 "/>
 </clipPath>
 <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="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1609.5 650.5 L 1633.5 650.5 L 1633.5 719.5 L 1609.5 719.5 Z M 271.5 650.5 L 296.5 650.5 L 296.5 719.5 L 271.5 719.5 Z M 341.5 650.5 L 366.5 650.5 L 366.5 719.5 L 341.5 719.5 Z M 412.5 650.5 L 436.5 650.5 L 436.5 719.5 L 412.5 719.5 Z M 482.5 650.5 L 507.5 650.5 L 507.5 719.5 L 482.5 719.5 Z M 553.5 650.5 L 577.5 650.5 L 577.5 719.5 L 553.5 719.5 Z M 623.5 650.5 L 648.5 650.5 L 648.5 719.5 L 623.5 719.5 Z M 694.5 650.5 L 718.5 650.5 L 718.5 719.5 L 694.5 719.5 Z M 764.5 650.5 L 789.5 650.5 L 789.5 719.5 L 764.5 719.5 Z M 835.5 650.5 L 859.5 650.5 L 859.5 719.5 L 835.5 719.5 Z M 905.5 650.5 L 930.5 650.5 L 930.5 719.5 L 905.5 719.5 Z M 976.5 650.5 L 1000.5 650.5 L 1000.5 719.5 L 976.5 719.5 Z M 1046.5 650.5 L 1071.5 650.5 L 1071.5 719.5 L 1046.5 719.5 Z M 1116.5 650.5 L 1140.5 650.5 L 1140.5 719.5 L 1116.5 719.5 Z M 1186.5 650.5 L 1211.5 650.5 L 1211.5 719.5 L 1186.5 719.5 Z M 1257.5 650.5 L 1281.5 650.5 L 1281.5 719.5 L 1257.5 719.5 Z M 1327.5 650.5 L 1352.5 650.5 L 1352.5 719.5 L 1327.5 719.5 Z M 1397.5 650.5 L 1422.5 650.5 L 1422.5 719.5 L 1397.5 719.5 Z M 1468.5 650.5 L 1492.5 650.5 L 1492.5 719.5 L 1468.5 719.5 Z M 1538.5 650.5 L 1563.5 650.5 L 1563.5 719.5 L 1538.5 719.5 Z M 1538.5 650.5 "/>
 </clipPath>
-<image id="image328" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1609.5 350.5 L 1633.5 350.5 L 1633.5 514.5 L 1609.5 514.5 Z M 271.5 350.5 L 296.5 350.5 L 296.5 514.5 L 271.5 514.5 Z M 341.5 350.5 L 366.5 350.5 L 366.5 514.5 L 341.5 514.5 Z M 412.5 350.5 L 436.5 350.5 L 436.5 514.5 L 412.5 514.5 Z M 482.5 350.5 L 507.5 350.5 L 507.5 514.5 L 482.5 514.5 Z M 553.5 350.5 L 577.5 350.5 L 577.5 514.5 L 553.5 514.5 Z M 623.5 350.5 L 648.5 350.5 L 648.5 514.5 L 623.5 514.5 Z M 694.5 350.5 L 718.5 350.5 L 718.5 514.5 L 694.5 514.5 Z M 764.5 350.5 L 789.5 350.5 L 789.5 514.5 L 764.5 514.5 Z M 835.5 350.5 L 859.5 350.5 L 859.5 514.5 L 835.5 514.5 Z M 905.5 350.5 L 930.5 350.5 L 930.5 514.5 L 905.5 514.5 Z M 976.5 350.5 L 1000.5 350.5 L 1000.5 514.5 L 976.5 514.5 Z M 1046.5 350.5 L 1071.5 350.5 L 1071.5 514.5 L 1046.5 514.5 Z M 1116.5 350.5 L 1140.5 350.5 L 1140.5 514.5 L 1116.5 514.5 Z M 1186.5 350.5 L 1211.5 350.5 L 1211.5 514.5 L 1186.5 514.5 Z M 1257.5 350.5 L 1281.5 350.5 L 1281.5 514.5 L 1257.5 514.5 Z M 1327.5 350.5 L 1352.5 350.5 L 1352.5 514.5 L 1327.5 514.5 Z M 1397.5 350.5 L 1422.5 350.5 L 1422.5 514.5 L 1397.5 514.5 Z M 1468.5 350.5 L 1492.5 350.5 L 1492.5 514.5 L 1468.5 514.5 Z M 1538.5 350.5 L 1563.5 350.5 L 1563.5 514.5 L 1538.5 514.5 Z M 1538.5 350.5 "/>
 </clipPath>
-<image id="image329" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 234.5 381.5 L 262.5 381.5 L 262.5 388.5 L 234.5 388.5 Z M 515.5 381.5 L 543.5 381.5 L 543.5 388.5 L 515.5 388.5 Z M 375.5 381.5 L 403.5 381.5 L 403.5 388.5 L 375.5 388.5 Z M 1220.5 381.5 L 1248.5 381.5 L 1248.5 407.5 L 1220.5 407.5 Z M 654.5 381.5 L 682.5 381.5 L 682.5 407.5 L 654.5 407.5 Z M 1644.5 381.5 L 1672.5 381.5 L 1672.5 407.5 L 1644.5 407.5 Z M 799.5 381.5 L 826.5 381.5 L 826.5 407.5 L 799.5 407.5 Z M 939.5 381.5 L 967.5 381.5 L 967.5 407.5 L 939.5 407.5 Z M 1080.5 381.5 L 1107.5 381.5 L 1107.5 407.5 L 1080.5 407.5 Z M 1361.5 381.5 L 1388.5 381.5 L 1388.5 407.5 L 1361.5 407.5 Z M 1500.5 381.5 L 1528.5 381.5 L 1528.5 407.5 L 1500.5 407.5 Z M 234.5 388.5 L 262.5 388.5 L 262.5 409.5 L 234.5 409.5 Z M 1500.5 407.5 L 1528.5 407.5 L 1528.5 409.5 L 1500.5 409.5 Z M 799.5 407.5 L 826.5 407.5 L 826.5 409.5 L 799.5 409.5 Z M 1644.5 407.5 L 1672.5 407.5 L 1672.5 409.5 L 1644.5 409.5 Z M 515.5 388.5 L 543.5 388.5 L 543.5 409.5 L 515.5 409.5 Z M 1080.5 407.5 L 1107.5 407.5 L 1107.5 409.5 L 1080.5 409.5 Z M 1361.5 407.5 L 1388.5 407.5 L 1388.5 409.5 L 1361.5 409.5 Z M 654.5 407.5 L 682.5 407.5 L 682.5 409.5 L 654.5 409.5 Z M 939.5 407.5 L 967.5 407.5 L 967.5 409.5 L 939.5 409.5 Z M 375.5 388.5 L 403.5 388.5 L 403.5 409.5 L 375.5 409.5 Z M 1220.5 407.5 L 1248.5 407.5 L 1248.5 409.5 L 1220.5 409.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image330" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,5 @@
 <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 229 781 L 257 781 M 229 753 L 257 753 M 229 753 L 229 781 M 257 753 L 257 781 " 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 229 781 L 257 781 M 229 753 L 257 753 M 257 781 L 257 753 M 229 781 L 229 753 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.svg b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.svg
index a10e1fa..751ee05 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.svg
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image372" 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="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <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="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 729.5 L 1107.5 729.5 L 1107.5 844.5 L 1066.5 844.5 Z M 822.5 729.5 L 863.5 729.5 L 863.5 844.5 L 822.5 844.5 Z M 951.5 729.5 L 992.5 729.5 L 992.5 844.5 L 951.5 844.5 Z M 951.5 729.5 "/>
 </clipPath>
-<image id="image322" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 822.5 228.5 L 863.5 228.5 L 863.5 502.5 L 822.5 502.5 Z M 951.5 228.5 L 992.5 228.5 L 992.5 502.5 L 951.5 502.5 Z M 951.5 228.5 "/>
 </clipPath>
-<image id="image323" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 1121.5 276.5 L 1168.5 276.5 L 1168.5 304.5 L 1121.5 304.5 Z M 879.5 280.5 L 925.5 280.5 L 925.5 308.5 L 879.5 308.5 Z M 1121.5 304.5 L 1168.5 304.5 L 1168.5 323.5 L 1121.5 323.5 Z M 879.5 308.5 L 925.5 308.5 L 925.5 327.5 L 879.5 327.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image324" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface369">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.svg b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.svg
index 4858509..6a28e10 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.svg
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" 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="#image300"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1180.5 729.5 L 1221.5 729.5 L 1221.5 844.5 L 1180.5 844.5 Z M 694.5 729.5 L 735.5 729.5 L 735.5 844.5 L 694.5 844.5 Z M 827.5 729.5 L 868.5 729.5 L 868.5 844.5 L 827.5 844.5 Z M 945.5 729.5 L 986.5 729.5 L 986.5 844.5 L 945.5 844.5 Z M 1062.5 729.5 L 1103.5 729.5 L 1103.5 844.5 L 1062.5 844.5 Z M 1062.5 729.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1178.5 228.5 L 1220.5 228.5 L 1220.5 502.5 L 1178.5 502.5 Z M 694.5 228.5 L 735.5 228.5 L 735.5 502.5 L 694.5 502.5 Z M 826.5 228.5 L 867.5 228.5 L 867.5 502.5 L 826.5 502.5 Z M 943.5 228.5 L 984.5 228.5 L 984.5 502.5 L 943.5 502.5 Z M 1061.5 228.5 L 1102.5 228.5 L 1102.5 502.5 L 1061.5 502.5 Z M 1061.5 228.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 752.5 280.5 L 798.5 280.5 L 798.5 291.5 L 752.5 291.5 Z M 994.5 276.5 L 1040.5 276.5 L 1040.5 297.5 L 994.5 297.5 Z M 1235.5 280.5 L 1281.5 280.5 L 1281.5 310.5 L 1235.5 310.5 Z M 994.5 297.5 L 1040.5 297.5 L 1040.5 323.5 L 994.5 323.5 Z M 752.5 291.5 L 798.5 291.5 L 798.5 327.5 L 752.5 327.5 Z M 1235.5 310.5 L 1281.5 310.5 L 1281.5 327.5 L 1235.5 327.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -156,6 +156,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.svg b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.svg
index 61ecdfc..82b9b78 100644
--- a/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.svg
+++ b/cells/lpflow_clkbufkapwr/sky130_fd_sc_hd__lpflow_clkbufkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image309"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 307.5 885.5 "/>
 </clipPath>
 <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="#image340"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1436.5 729.5 L 1477.5 729.5 L 1477.5 844.5 L 1436.5 844.5 Z M 377.5 729.5 L 418.5 729.5 L 418.5 844.5 L 377.5 844.5 Z M 495.5 729.5 L 536.5 729.5 L 536.5 844.5 L 495.5 844.5 Z M 612.5 729.5 L 653.5 729.5 L 653.5 844.5 L 612.5 844.5 Z M 730.5 729.5 L 771.5 729.5 L 771.5 844.5 L 730.5 844.5 Z M 848.5 729.5 L 889.5 729.5 L 889.5 844.5 L 848.5 844.5 Z M 965.5 729.5 L 1006.5 729.5 L 1006.5 844.5 L 965.5 844.5 Z M 1083.5 729.5 L 1124.5 729.5 L 1124.5 844.5 L 1083.5 844.5 Z M 1200.5 729.5 L 1241.5 729.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1318.5 729.5 L 1359.5 729.5 L 1359.5 844.5 L 1318.5 844.5 Z M 1318.5 729.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image341"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1436.5 228.5 L 1477.5 228.5 L 1477.5 502.5 L 1436.5 502.5 Z M 377.5 228.5 L 418.5 228.5 L 418.5 502.5 L 377.5 502.5 Z M 495.5 228.5 L 536.5 228.5 L 536.5 502.5 L 495.5 502.5 Z M 612.5 228.5 L 653.5 228.5 L 653.5 502.5 L 612.5 502.5 Z M 730.5 228.5 L 771.5 228.5 L 771.5 502.5 L 730.5 502.5 Z M 848.5 228.5 L 889.5 228.5 L 889.5 502.5 L 848.5 502.5 Z M 965.5 228.5 L 1006.5 228.5 L 1006.5 502.5 L 965.5 502.5 Z M 1083.5 228.5 L 1124.5 228.5 L 1124.5 502.5 L 1083.5 502.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 502.5 L 1200.5 502.5 Z M 1318.5 228.5 L 1359.5 228.5 L 1359.5 502.5 L 1318.5 502.5 Z M 1318.5 228.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 315.5 280.5 L 362.5 280.5 L 362.5 305.5 L 315.5 305.5 Z M 551.5 280.5 L 597.5 280.5 L 597.5 305.5 L 551.5 305.5 Z M 1493.5 280.5 L 1540.5 280.5 L 1540.5 324.5 L 1493.5 324.5 Z M 1017.5 280.5 L 1064.5 280.5 L 1064.5 324.5 L 1017.5 324.5 Z M 785.5 280.5 L 831.5 280.5 L 831.5 324.5 L 785.5 324.5 Z M 1258.5 280.5 L 1304.5 280.5 L 1304.5 324.5 L 1258.5 324.5 Z M 1493.5 324.5 L 1540.5 324.5 L 1540.5 327.5 L 1493.5 327.5 Z M 315.5 305.5 L 362.5 305.5 L 362.5 327.5 L 315.5 327.5 Z M 1258.5 324.5 L 1304.5 324.5 L 1304.5 327.5 L 1258.5 327.5 Z M 785.5 324.5 L 831.5 324.5 L 831.5 327.5 L 785.5 327.5 Z M 551.5 305.5 L 597.5 305.5 L 597.5 327.5 L 551.5 327.5 Z M 1017.5 324.5 L 1064.5 324.5 L 1064.5 327.5 L 1017.5 327.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 307 938 L 354 938 M 307 892 L 354 892 M 307 892 L 307 938 M 354 892 L 354 938 " 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 307 938 L 354 938 M 307 892 L 354 892 M 354 938 L 354 892 M 307 938 L 307 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.svg b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.svg
index 1f4ecfe..77eb95c 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.svg
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <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="#image355"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 998.5 729.5 L 1039.5 729.5 L 1039.5 844.5 L 998.5 844.5 Z M 998.5 729.5 "/>
 </clipPath>
-<image id="image307" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 228.5 L 1040.5 228.5 L 1040.5 458.5 L 999.5 458.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 458.5 L 884.5 458.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image308" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 819.5 280.5 L 865.5 280.5 L 865.5 291.5 L 819.5 291.5 Z M 1065.5 280.5 L 1111.5 280.5 L 1111.5 291.5 L 1065.5 291.5 Z M 1065.5 291.5 L 1111.5 291.5 L 1111.5 327.5 L 1065.5 327.5 Z M 819.5 291.5 L 865.5 291.5 L 865.5 327.5 L 819.5 327.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image309" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,5 @@
 <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 816 938 L 863 938 M 816 892 L 863 892 M 816 892 L 816 938 M 863 892 L 863 938 " 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 816 938 L 863 938 M 816 892 L 863 892 M 863 938 L 863 892 M 816 938 L 816 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.svg b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.svg
index d33aa8b..0fec8e2 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.svg
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1406.5 631.5 L 1426.5 631.5 L 1426.5 689.5 L 1406.5 689.5 Z M 493.5 631.5 L 514.5 631.5 L 514.5 689.5 L 493.5 689.5 Z M 552.5 631.5 L 573.5 631.5 L 573.5 689.5 L 552.5 689.5 Z M 611.5 631.5 L 632.5 631.5 L 632.5 689.5 L 611.5 689.5 Z M 670.5 631.5 L 691.5 631.5 L 691.5 689.5 L 670.5 689.5 Z M 729.5 631.5 L 750.5 631.5 L 750.5 689.5 L 729.5 689.5 Z M 789.5 631.5 L 809.5 631.5 L 809.5 689.5 L 789.5 689.5 Z M 852.5 631.5 L 873.5 631.5 L 873.5 689.5 L 852.5 689.5 Z M 933.5 631.5 L 953.5 631.5 L 953.5 689.5 L 933.5 689.5 Z M 992.5 631.5 L 1013.5 631.5 L 1013.5 689.5 L 992.5 689.5 Z M 1051.5 631.5 L 1072.5 631.5 L 1072.5 689.5 L 1051.5 689.5 Z M 1110.5 631.5 L 1131.5 631.5 L 1131.5 689.5 L 1110.5 689.5 Z M 1169.5 631.5 L 1190.5 631.5 L 1190.5 689.5 L 1169.5 689.5 Z M 1228.5 631.5 L 1249.5 631.5 L 1249.5 689.5 L 1228.5 689.5 Z M 1287.5 631.5 L 1308.5 631.5 L 1308.5 689.5 L 1287.5 689.5 Z M 1346.5 631.5 L 1367.5 631.5 L 1367.5 689.5 L 1346.5 689.5 Z M 1346.5 631.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1642.5 379.5 L 1662.5 379.5 L 1662.5 517.5 L 1642.5 517.5 Z M 257.5 379.5 L 277.5 379.5 L 277.5 517.5 L 257.5 517.5 Z M 316.5 379.5 L 336.5 379.5 L 336.5 517.5 L 316.5 517.5 Z M 375.5 379.5 L 396.5 379.5 L 396.5 517.5 L 375.5 517.5 Z M 434.5 379.5 L 455.5 379.5 L 455.5 517.5 L 434.5 517.5 Z M 493.5 379.5 L 514.5 379.5 L 514.5 517.5 L 493.5 517.5 Z M 552.5 379.5 L 573.5 379.5 L 573.5 517.5 L 552.5 517.5 Z M 611.5 379.5 L 632.5 379.5 L 632.5 517.5 L 611.5 517.5 Z M 670.5 379.5 L 691.5 379.5 L 691.5 517.5 L 670.5 517.5 Z M 729.5 379.5 L 750.5 379.5 L 750.5 517.5 L 729.5 517.5 Z M 789.5 379.5 L 809.5 379.5 L 809.5 517.5 L 789.5 517.5 Z M 852.5 379.5 L 873.5 379.5 L 873.5 517.5 L 852.5 517.5 Z M 933.5 379.5 L 953.5 379.5 L 953.5 517.5 L 933.5 517.5 Z M 992.5 379.5 L 1013.5 379.5 L 1013.5 517.5 L 992.5 517.5 Z M 1051.5 379.5 L 1072.5 379.5 L 1072.5 517.5 L 1051.5 517.5 Z M 1110.5 379.5 L 1131.5 379.5 L 1131.5 517.5 L 1110.5 517.5 Z M 1169.5 379.5 L 1190.5 379.5 L 1190.5 517.5 L 1169.5 517.5 Z M 1228.5 379.5 L 1249.5 379.5 L 1249.5 517.5 L 1228.5 517.5 Z M 1287.5 379.5 L 1308.5 379.5 L 1308.5 517.5 L 1287.5 517.5 Z M 1346.5 379.5 L 1367.5 379.5 L 1367.5 517.5 L 1346.5 517.5 Z M 1406.5 379.5 L 1426.5 379.5 L 1426.5 517.5 L 1406.5 517.5 Z M 1465.5 379.5 L 1485.5 379.5 L 1485.5 517.5 L 1465.5 517.5 Z M 1524.5 379.5 L 1544.5 379.5 L 1544.5 517.5 L 1524.5 517.5 Z M 1583.5 379.5 L 1603.5 379.5 L 1603.5 517.5 L 1583.5 517.5 Z M 1583.5 379.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 218.5 406.5 L 242.5 406.5 L 242.5 411.5 L 218.5 411.5 Z M 336.5 406.5 L 360.5 406.5 L 360.5 411.5 L 336.5 411.5 Z M 949.5 406.5 L 973.5 406.5 L 973.5 411.5 L 949.5 411.5 Z M 581.5 406.5 L 604.5 406.5 L 604.5 411.5 L 581.5 411.5 Z M 1194.5 406.5 L 1217.5 406.5 L 1217.5 411.5 L 1194.5 411.5 Z M 1076.5 406.5 L 1099.5 406.5 L 1099.5 411.5 L 1076.5 411.5 Z M 1432.5 406.5 L 1455.5 406.5 L 1455.5 411.5 L 1432.5 411.5 Z M 1318.5 406.5 L 1341.5 406.5 L 1341.5 411.5 L 1318.5 411.5 Z M 1673.5 406.5 L 1697.5 406.5 L 1697.5 411.5 L 1673.5 411.5 Z M 707.5 406.5 L 731.5 406.5 L 731.5 411.5 L 707.5 411.5 Z M 460.5 406.5 L 484.5 406.5 L 484.5 411.5 L 460.5 411.5 Z M 1550.5 406.5 L 1573.5 406.5 L 1573.5 411.5 L 1550.5 411.5 Z M 826.5 406.5 L 849.5 406.5 L 849.5 411.5 L 826.5 411.5 Z M 1550.5 411.5 L 1573.5 411.5 L 1573.5 429.5 L 1550.5 429.5 Z M 336.5 411.5 L 360.5 411.5 L 360.5 429.5 L 336.5 429.5 Z M 581.5 411.5 L 604.5 411.5 L 604.5 429.5 L 581.5 429.5 Z M 1194.5 411.5 L 1217.5 411.5 L 1217.5 429.5 L 1194.5 429.5 Z M 1318.5 411.5 L 1341.5 411.5 L 1341.5 429.5 L 1318.5 429.5 Z M 707.5 411.5 L 731.5 411.5 L 731.5 429.5 L 707.5 429.5 Z M 218.5 411.5 L 242.5 411.5 L 242.5 429.5 L 218.5 429.5 Z M 1673.5 411.5 L 1697.5 411.5 L 1697.5 429.5 L 1673.5 429.5 Z M 460.5 411.5 L 484.5 411.5 L 484.5 429.5 L 460.5 429.5 Z M 949.5 411.5 L 973.5 411.5 L 973.5 429.5 L 949.5 429.5 Z M 1432.5 411.5 L 1455.5 411.5 L 1455.5 429.5 L 1432.5 429.5 Z M 1076.5 411.5 L 1099.5 411.5 L 1099.5 429.5 L 1076.5 429.5 Z M 826.5 411.5 L 849.5 411.5 L 849.5 429.5 L 826.5 429.5 Z M 410.5 546.5 L 433.5 546.5 L 433.5 550.5 L 410.5 550.5 Z M 473.5 546.5 L 497.5 546.5 L 497.5 550.5 L 473.5 550.5 Z M 1485.5 546.5 L 1508.5 546.5 L 1508.5 550.5 L 1485.5 550.5 Z M 1548.5 546.5 L 1571.5 546.5 L 1571.5 550.5 L 1548.5 550.5 Z M 1485.5 550.5 L 1508.5 550.5 L 1508.5 569.5 L 1485.5 569.5 Z M 410.5 550.5 L 433.5 550.5 L 433.5 569.5 L 410.5 569.5 Z M 473.5 550.5 L 497.5 550.5 L 497.5 569.5 L 473.5 569.5 Z M 1548.5 550.5 L 1571.5 550.5 L 1571.5 569.5 L 1548.5 569.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 220 743 L 244 743 M 220 720 L 244 720 M 220 720 L 220 743 M 244 720 L 244 743 " 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 220 743 L 244 743 M 220 720 L 244 720 M 244 743 L 244 720 M 220 743 L 220 720 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.svg b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.svg
index c656a42..17163c2 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.svg
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image304" 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="#image304"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 729.5 L 1107.5 729.5 L 1107.5 844.5 L 1066.5 844.5 Z M 949.5 729.5 L 990.5 729.5 L 990.5 844.5 L 949.5 844.5 Z M 949.5 729.5 "/>
 </clipPath>
-<image id="image305" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1062.5 228.5 L 1103.5 228.5 L 1103.5 502.5 L 1062.5 502.5 Z M 827.5 228.5 L 868.5 228.5 L 868.5 502.5 L 827.5 502.5 Z M 945.5 228.5 L 986.5 228.5 L 986.5 502.5 L 945.5 502.5 Z M 945.5 228.5 "/>
 </clipPath>
-<image id="image306" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 876.5 280.5 L 923.5 280.5 L 923.5 301.5 L 876.5 301.5 Z M 1122.5 280.5 L 1169.5 280.5 L 1169.5 301.5 L 1122.5 301.5 Z M 1122.5 301.5 L 1169.5 301.5 L 1169.5 327.5 L 1122.5 327.5 Z M 876.5 301.5 L 923.5 301.5 L 923.5 327.5 L 876.5 327.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image307" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.svg b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.svg
index 290a118..58eef0a 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.svg
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image310"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1113.5 729.5 L 1154.5 729.5 L 1154.5 844.5 L 1113.5 844.5 Z M 760.5 729.5 L 801.5 729.5 L 801.5 844.5 L 760.5 844.5 Z M 878.5 729.5 L 919.5 729.5 L 919.5 844.5 L 878.5 844.5 Z M 995.5 729.5 L 1036.5 729.5 L 1036.5 844.5 L 995.5 844.5 Z M 995.5 729.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1230.5 228.5 L 1272.5 228.5 L 1272.5 502.5 L 1230.5 502.5 Z M 642.5 228.5 L 683.5 228.5 L 683.5 502.5 L 642.5 502.5 Z M 760.5 228.5 L 801.5 228.5 L 801.5 502.5 L 760.5 502.5 Z M 878.5 228.5 L 919.5 228.5 L 919.5 502.5 L 878.5 502.5 Z M 995.5 228.5 L 1036.5 228.5 L 1036.5 502.5 L 995.5 502.5 Z M 1113.5 228.5 L 1154.5 228.5 L 1154.5 502.5 L 1113.5 502.5 Z M 1113.5 228.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 575.5 280.5 L 622.5 280.5 L 622.5 301.5 L 575.5 301.5 Z M 811.5 280.5 L 857.5 280.5 L 857.5 301.5 L 811.5 301.5 Z M 1057.5 280.5 L 1103.5 280.5 L 1103.5 301.5 L 1057.5 301.5 Z M 1297.5 280.5 L 1344.5 280.5 L 1344.5 301.5 L 1297.5 301.5 Z M 811.5 301.5 L 857.5 301.5 L 857.5 327.5 L 811.5 327.5 Z M 575.5 301.5 L 622.5 301.5 L 622.5 327.5 L 575.5 327.5 Z M 1297.5 301.5 L 1344.5 301.5 L 1344.5 327.5 L 1297.5 327.5 Z M 1057.5 301.5 L 1103.5 301.5 L 1103.5 327.5 L 1057.5 327.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.svg b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.svg
index 3024ab9..5572265 100644
--- a/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.svg
+++ b/cells/lpflow_clkinvkapwr/sky130_fd_sc_hd__lpflow_clkinvkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <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="#image352"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1295.5 710.5 L 1332.5 710.5 L 1332.5 813.5 L 1295.5 813.5 Z M 552.5 710.5 L 589.5 710.5 L 589.5 813.5 L 552.5 813.5 Z M 658.5 710.5 L 695.5 710.5 L 695.5 813.5 L 658.5 813.5 Z M 764.5 710.5 L 801.5 710.5 L 801.5 813.5 L 764.5 813.5 Z M 870.5 710.5 L 907.5 710.5 L 907.5 813.5 L 870.5 813.5 Z M 976.5 710.5 L 1013.5 710.5 L 1013.5 813.5 L 976.5 813.5 Z M 1082.5 710.5 L 1119.5 710.5 L 1119.5 813.5 L 1082.5 813.5 Z M 1188.5 710.5 L 1225.5 710.5 L 1225.5 813.5 L 1188.5 813.5 Z M 1188.5 710.5 "/>
 </clipPath>
-<image id="image323" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1460.5 258.5 L 1497.5 258.5 L 1497.5 505.5 L 1460.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 423.5 258.5 L 460.5 258.5 L 460.5 505.5 L 423.5 505.5 Z M 528.5 258.5 L 565.5 258.5 L 565.5 505.5 L 528.5 505.5 Z M 631.5 258.5 L 668.5 258.5 L 668.5 505.5 L 631.5 505.5 Z M 735.5 258.5 L 772.5 258.5 L 772.5 505.5 L 735.5 505.5 Z M 838.5 258.5 L 875.5 258.5 L 875.5 505.5 L 838.5 505.5 Z M 942.5 258.5 L 979.5 258.5 L 979.5 505.5 L 942.5 505.5 Z M 1045.5 258.5 L 1082.5 258.5 L 1082.5 505.5 L 1045.5 505.5 Z M 1149.5 258.5 L 1186.5 258.5 L 1186.5 505.5 L 1149.5 505.5 Z M 1253.5 258.5 L 1290.5 258.5 L 1290.5 505.5 L 1253.5 505.5 Z M 1356.5 258.5 L 1393.5 258.5 L 1393.5 505.5 L 1356.5 505.5 Z M 1356.5 258.5 "/>
 </clipPath>
-<image id="image324" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 254.5 305.5 L 296.5 305.5 L 296.5 324.5 L 254.5 324.5 Z M 466.5 305.5 L 508.5 305.5 L 508.5 324.5 L 466.5 324.5 Z M 905.5 305.5 L 947.5 305.5 L 947.5 324.5 L 905.5 324.5 Z M 1518.5 305.5 L 1560.5 305.5 L 1560.5 324.5 L 1518.5 324.5 Z M 1084.5 305.5 L 1126.5 305.5 L 1126.5 324.5 L 1084.5 324.5 Z M 1296.5 305.5 L 1338.5 305.5 L 1338.5 324.5 L 1296.5 324.5 Z M 688.5 305.5 L 730.5 305.5 L 730.5 324.5 L 688.5 324.5 Z M 1518.5 324.5 L 1560.5 324.5 L 1560.5 347.5 L 1518.5 347.5 Z M 1296.5 324.5 L 1338.5 324.5 L 1338.5 347.5 L 1296.5 347.5 Z M 466.5 324.5 L 508.5 324.5 L 508.5 347.5 L 466.5 347.5 Z M 905.5 324.5 L 947.5 324.5 L 947.5 347.5 L 905.5 347.5 Z M 1084.5 324.5 L 1126.5 324.5 L 1126.5 347.5 L 1084.5 347.5 Z M 688.5 324.5 L 730.5 324.5 L 730.5 347.5 L 688.5 347.5 Z M 254.5 324.5 L 296.5 324.5 L 296.5 347.5 L 254.5 347.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image325" 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="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;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.svg b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.svg
index 298fe3f..da4f068 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.svg
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 331.5 689.5 L 1589.5 689.5 L 1589.5 835.5 L 331.5 835.5 Z M 331.5 689.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 331.5 237.5 L 1589.5 237.5 L 1589.5 468.5 L 331.5 468.5 Z M 331.5 237.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 287.5 L 310.5 287.5 L 310.5 298.5 L 264.5 298.5 Z M 1610.5 287.5 L 1655.5 287.5 L 1655.5 298.5 L 1610.5 298.5 Z M 1488.5 287.5 L 1533.5 287.5 L 1533.5 333.5 L 1488.5 333.5 Z M 1365.5 287.5 L 1411.5 287.5 L 1411.5 333.5 L 1365.5 333.5 Z M 1243.5 287.5 L 1288.5 287.5 L 1288.5 333.5 L 1243.5 333.5 Z M 1121.5 287.5 L 1166.5 287.5 L 1166.5 333.5 L 1121.5 333.5 Z M 998.5 287.5 L 1044.5 287.5 L 1044.5 333.5 L 998.5 333.5 Z M 876.5 287.5 L 921.5 287.5 L 921.5 333.5 L 876.5 333.5 Z M 264.5 298.5 L 310.5 298.5 L 310.5 333.5 L 264.5 333.5 Z M 631.5 287.5 L 677.5 287.5 L 677.5 333.5 L 631.5 333.5 Z M 509.5 287.5 L 554.5 287.5 L 554.5 333.5 L 509.5 333.5 Z M 387.5 287.5 L 432.5 287.5 L 432.5 333.5 L 387.5 333.5 Z M 754.5 287.5 L 799.5 287.5 L 799.5 333.5 L 754.5 333.5 Z M 1610.5 298.5 L 1655.5 298.5 L 1655.5 333.5 L 1610.5 333.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <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 264 204 L 310 204 M 264 159 L 310 159 M 264 159 L 264 204 M 310 159 L 310 204 " 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 264 204 L 310 204 M 264 159 L 310 159 M 310 204 L 310 159 M 264 204 L 264 159 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.svg b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.svg
index cd2afae..113ee3e 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.svg
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_3.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" 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="#image283"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 816.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 884.5 693.5 L 1046.5 693.5 L 1046.5 844.5 L 884.5 844.5 Z M 884.5 693.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 884.5 228.5 L 1046.5 228.5 L 1046.5 466.5 L 884.5 466.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 280.5 L 863.5 280.5 L 863.5 291.5 L 816.5 291.5 Z M 1068.5 280.5 L 1114.5 280.5 L 1114.5 291.5 L 1068.5 291.5 Z M 942.5 280.5 L 988.5 280.5 L 988.5 327.5 L 942.5 327.5 Z M 1068.5 291.5 L 1114.5 291.5 L 1114.5 327.5 L 1068.5 327.5 Z M 816.5 291.5 L 863.5 291.5 L 863.5 327.5 L 816.5 327.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <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 816 194 L 863 194 M 816 148 L 863 148 M 816 148 L 816 194 M 863 148 L 863 194 " 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 816 194 L 863 194 M 816 148 L 863 148 M 863 194 L 863 148 M 816 194 L 816 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.svg b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.svg
index e259619..ee9e3a3 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.svg
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 820.5 693.5 L 1107.5 693.5 L 1107.5 844.5 L 820.5 844.5 Z M 820.5 693.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 820.5 228.5 L 1107.5 228.5 L 1107.5 466.5 L 820.5 466.5 Z M 820.5 228.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 280.5 L 798.5 280.5 L 798.5 291.5 L 752.5 291.5 Z M 1129.5 280.5 L 1176.5 280.5 L 1176.5 291.5 L 1129.5 291.5 Z M 1003.5 280.5 L 1050.5 280.5 L 1050.5 327.5 L 1003.5 327.5 Z M 878.5 280.5 L 924.5 280.5 L 924.5 327.5 L 878.5 327.5 Z M 752.5 291.5 L 798.5 291.5 L 798.5 327.5 L 752.5 327.5 Z M 1129.5 291.5 L 1176.5 291.5 L 1176.5 327.5 L 1129.5 327.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <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 752 194 L 798 194 M 752 148 L 798 148 M 752 148 L 752 194 M 798 148 L 798 194 " 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 752 194 L 798 194 M 752 148 L 798 148 M 798 194 L 798 148 M 752 194 L 752 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.svg b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.svg
index a9a9378..d4910e4 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.svg
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 693.5 693.5 L 1232.5 693.5 L 1232.5 844.5 L 693.5 844.5 Z M 693.5 693.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 693.5 228.5 L 1232.5 228.5 L 1232.5 466.5 L 693.5 466.5 Z M 693.5 228.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 280.5 L 671.5 280.5 L 671.5 291.5 L 625.5 291.5 Z M 1254.5 280.5 L 1300.5 280.5 L 1300.5 291.5 L 1254.5 291.5 Z M 1128.5 280.5 L 1174.5 280.5 L 1174.5 327.5 L 1128.5 327.5 Z M 1002.5 280.5 L 1049.5 280.5 L 1049.5 327.5 L 1002.5 327.5 Z M 876.5 280.5 L 923.5 280.5 L 923.5 327.5 L 876.5 327.5 Z M 1254.5 291.5 L 1300.5 291.5 L 1300.5 327.5 L 1254.5 327.5 Z M 750.5 280.5 L 797.5 280.5 L 797.5 327.5 L 750.5 327.5 Z M 625.5 291.5 L 671.5 291.5 L 671.5 327.5 L 625.5 327.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.svg b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.svg
index 0ab8ac4..0c5cf3e 100644
--- a/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.svg
+++ b/cells/lpflow_decapkapwr/sky130_fd_sc_hd__lpflow_decapkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 693.5 L 1356.5 693.5 L 1356.5 844.5 L 566.5 844.5 Z M 566.5 693.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 1356.5 228.5 L 1356.5 466.5 L 566.5 466.5 Z M 566.5 228.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 280.5 L 544.5 280.5 L 544.5 291.5 L 497.5 291.5 Z M 1378.5 280.5 L 1425.5 280.5 L 1425.5 291.5 L 1378.5 291.5 Z M 1252.5 280.5 L 1299.5 280.5 L 1299.5 327.5 L 1252.5 327.5 Z M 1127.5 280.5 L 1173.5 280.5 L 1173.5 327.5 L 1127.5 327.5 Z M 1001.5 280.5 L 1047.5 280.5 L 1047.5 327.5 L 1001.5 327.5 Z M 875.5 280.5 L 921.5 280.5 L 921.5 327.5 L 875.5 327.5 Z M 1378.5 291.5 L 1425.5 291.5 L 1425.5 327.5 L 1378.5 327.5 Z M 623.5 280.5 L 670.5 280.5 L 670.5 327.5 L 623.5 327.5 Z M 749.5 280.5 L 796.5 280.5 L 796.5 327.5 L 749.5 327.5 Z M 497.5 291.5 L 544.5 291.5 L 544.5 327.5 L 497.5 327.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <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 497 194 L 544 194 M 497 148 L 544 148 M 497 148 L 497 194 M 544 148 L 544 194 " 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 497 194 L 544 194 M 497 148 L 544 148 M 544 194 L 544 148 M 497 194 L 497 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.svg b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.svg
index d15a385..fce5ae5 100644
--- a/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.svg
+++ b/cells/lpflow_inputiso0n/sky130_fd_sc_hd__lpflow_inputiso0n_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 920.5 691.5 L 961.5 691.5 L 961.5 806.5 L 920.5 806.5 Z M 805.5 691.5 L 846.5 691.5 L 846.5 806.5 L 805.5 806.5 Z M 1068.5 666.5 L 1109.5 666.5 L 1109.5 844.5 L 1068.5 844.5 Z M 1068.5 666.5 "/>
 </clipPath>
-<image id="image315" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 920.5 286.5 L 961.5 286.5 L 961.5 401.5 L 920.5 401.5 Z M 805.5 286.5 L 846.5 286.5 L 846.5 401.5 L 805.5 401.5 Z M 1068.5 228.5 L 1109.5 228.5 L 1109.5 502.5 L 1068.5 502.5 Z M 1068.5 228.5 "/>
 </clipPath>
-<image id="image316" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image317" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 687 194 L 734 194 M 687 148 L 734 148 M 687 148 L 687 194 M 734 148 L 734 194 " 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 687 194 L 734 194 M 687 148 L 734 148 M 734 194 L 734 148 M 687 194 L 687 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.svg b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.svg
index 84ea9f6..f891162 100644
--- a/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.svg
+++ b/cells/lpflow_inputiso0p/sky130_fd_sc_hd__lpflow_inputiso0p_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image356" 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="#image329"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1191.5 666.5 L 1232.5 666.5 L 1232.5 844.5 L 1191.5 844.5 Z M 693.5 729.5 L 734.5 729.5 L 734.5 844.5 L 693.5 844.5 Z M 1057.5 729.5 L 1098.5 729.5 L 1098.5 844.5 L 1057.5 844.5 Z M 950.5 729.5 L 991.5 729.5 L 991.5 844.5 L 950.5 844.5 Z M 950.5 729.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 947.5 228.5 L 988.5 228.5 L 988.5 343.5 L 947.5 343.5 Z M 693.5 228.5 L 734.5 228.5 L 734.5 343.5 L 693.5 343.5 Z M 827.5 228.5 L 868.5 228.5 L 868.5 343.5 L 827.5 343.5 Z M 1191.5 228.5 L 1232.5 228.5 L 1232.5 502.5 L 1191.5 502.5 Z M 1191.5 228.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface353">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.svg b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.svg
index e5184f7..a869eea 100644
--- a/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.svg
+++ b/cells/lpflow_inputiso1n/sky130_fd_sc_hd__lpflow_inputiso1n_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image323" 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="#image296"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 939.5 721.5 L 980.5 721.5 L 980.5 836.5 L 939.5 836.5 Z M 693.5 721.5 L 734.5 721.5 L 734.5 836.5 L 693.5 836.5 Z M 1054.5 721.5 L 1095.5 721.5 L 1095.5 836.5 L 1054.5 836.5 Z M 1188.5 666.5 L 1229.5 666.5 L 1229.5 844.5 L 1188.5 844.5 Z M 1188.5 666.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 228.5 L 1229.5 228.5 L 1229.5 502.5 L 1188.5 502.5 Z M 693.5 387.5 L 734.5 387.5 L 734.5 502.5 L 693.5 502.5 Z M 1054.5 387.5 L 1095.5 387.5 L 1095.5 502.5 L 1054.5 502.5 Z M 956.5 387.5 L 997.5 387.5 L 997.5 502.5 L 956.5 502.5 Z M 956.5 387.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 626 938 L 672 938 M 626 892 L 672 892 M 626 892 L 626 938 M 672 892 L 672 938 " 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 626 938 L 672 938 M 626 892 L 672 892 M 672 938 L 672 892 M 626 938 L 626 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.svg b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.svg
index f26bdd5..f078acd 100644
--- a/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.svg
+++ b/cells/lpflow_inputiso1p/sky130_fd_sc_hd__lpflow_inputiso1p_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" 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="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1043.5 666.5 L 1084.5 666.5 L 1084.5 844.5 L 1043.5 844.5 Z M 796.5 729.5 L 837.5 729.5 L 837.5 844.5 L 796.5 844.5 Z M 910.5 729.5 L 951.5 729.5 L 951.5 844.5 L 910.5 844.5 Z M 910.5 729.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1043.5 228.5 L 1084.5 228.5 L 1084.5 502.5 L 1043.5 502.5 Z M 812.5 387.5 L 853.5 387.5 L 853.5 502.5 L 812.5 502.5 Z M 910.5 387.5 L 951.5 387.5 L 951.5 502.5 L 910.5 502.5 Z M 910.5 387.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 939 427 L 986 427 M 939 380 L 986 380 M 939 380 L 939 427 M 986 380 L 986 427 M 687 427 L 734 427 M 687 380 L 734 380 M 687 380 L 687 427 M 734 380 L 734 427 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.svg b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.svg
index afd7398..f6f6c4a 100644
--- a/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.svg
+++ b/cells/lpflow_inputisolatch/sky130_fd_sc_hd__lpflow_inputisolatch_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" 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="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 307.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1388.5 666.5 L 1429.5 666.5 L 1429.5 844.5 L 1388.5 844.5 Z M 878.5 745.5 L 919.5 745.5 L 919.5 844.5 L 878.5 844.5 Z M 1013.5 745.5 L 1054.5 745.5 L 1054.5 844.5 L 1013.5 844.5 Z M 1128.5 745.5 L 1169.5 745.5 L 1169.5 844.5 L 1128.5 844.5 Z M 376.5 729.5 L 417.5 729.5 L 417.5 844.5 L 376.5 844.5 Z M 491.5 729.5 L 532.5 729.5 L 532.5 844.5 L 491.5 844.5 Z M 748.5 729.5 L 789.5 729.5 L 789.5 844.5 L 748.5 844.5 Z M 1503.5 666.5 L 1544.5 666.5 L 1544.5 844.5 L 1503.5 844.5 Z M 1503.5 666.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 878.5 228.5 L 919.5 228.5 L 919.5 343.5 L 878.5 343.5 Z M 992.5 228.5 L 1034.5 228.5 L 1034.5 343.5 L 992.5 343.5 Z M 1128.5 228.5 L 1169.5 228.5 L 1169.5 343.5 L 1128.5 343.5 Z M 491.5 237.5 L 532.5 237.5 L 532.5 387.5 L 491.5 387.5 Z M 376.5 237.5 L 417.5 237.5 L 417.5 387.5 L 376.5 387.5 Z M 748.5 228.5 L 789.5 228.5 L 789.5 403.5 L 748.5 403.5 Z M 1388.5 228.5 L 1429.5 228.5 L 1429.5 502.5 L 1388.5 502.5 Z M 1503.5 228.5 L 1544.5 228.5 L 1544.5 502.5 L 1503.5 502.5 Z M 1503.5 228.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface363">
+<g id="surface391">
 <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(100%,100%,0%);fill-opacity:0.724409;" d="M 687.039062 521.511719 L 683.03125 521.511719 L 682.746094 520.316406 L 682.367188 519.222656 L 681.839844 518.265625 L 681.171875 517.503906 L 680.363281 516.933594 L 679.457031 516.457031 L 679.074219 516.359375 L 678.695312 516.265625 L 678.3125 516.214844 L 677.929688 516.121094 L 677.5 516.121094 L 677.121094 516.074219 L 675.878906 516.214844 L 674.785156 516.503906 L 673.78125 516.980469 L 672.875 517.695312 L 672.113281 518.601562 L 671.492188 519.648438 L 671.0625 520.554688 L 670.777344 521.511719 L 670.492188 522.511719 L 670.347656 523.65625 L 670.207031 524.800781 L 670.207031 526.039062 L 670.253906 527.851562 L 670.492188 529.425781 L 670.921875 530.855469 L 671.445312 532.097656 L 672.160156 533.191406 L 673.066406 534.097656 L 673.640625 534.574219 L 674.257812 534.910156 L 674.925781 535.195312 L 675.640625 535.386719 L 676.40625 535.53125 L 677.214844 535.53125 L 678.789062 535.386719 L 680.125 534.863281 L 681.269531 534.050781 L 682.175781 532.859375 L 682.84375 531.378906 L 683.320312 529.519531 L 687.324219 529.519531 L 687.085938 531.332031 L 686.65625 532.90625 L 686.039062 534.335938 L 685.226562 535.578125 L 684.226562 536.675781 L 683.082031 537.578125 L 682.222656 538.105469 L 681.316406 538.484375 L 680.363281 538.773438 L 679.3125 539.011719 L 678.214844 539.152344 L 677.121094 539.203125 L 675.449219 539.058594 L 673.925781 538.773438 L 672.496094 538.246094 L 671.207031 537.578125 L 670.015625 536.675781 L 668.964844 535.53125 L 668.058594 534.335938 L 667.296875 532.953125 L 666.773438 531.429688 L 666.34375 529.757812 L 666.105469 527.996094 L 666.058594 526.039062 L 666.105469 523.988281 L 666.390625 522.082031 L 666.867188 520.316406 L 667.488281 518.695312 L 668.296875 517.21875 L 669.300781 515.882812 L 670.347656 514.832031 L 671.492188 513.976562 L 672.734375 513.308594 L 674.117188 512.832031 L 675.59375 512.542969 L 677.167969 512.402344 L 678.933594 512.542969 L 680.554688 512.832031 L 682.03125 513.402344 L 683.320312 514.117188 L 684.414062 515.121094 L 685.371094 516.265625 L 685.796875 517.027344 L 686.179688 517.789062 L 686.464844 518.648438 L 686.753906 519.554688 L 686.894531 520.507812 Z M 687.039062 521.511719 "/>
 <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 695.144531 503.339844 L 695.144531 523.703125 L 705.730469 513.117188 L 710.832031 513.117188 L 702.15625 521.75 L 712.359375 538.105469 L 707.449219 538.105469 L 699.007812 524.5625 L 695.144531 528.375 L 695.144531 538.105469 L 691.1875 538.105469 L 691.1875 503.339844 Z M 695.144531 503.339844 "/>
 <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 268 167 L 268 174 M 264 171 L 271 171 M 521 553 L 521 562 M 516 558 L 525 558 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.svg b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.svg
index ac3771a..ba2a39c 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.svg
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1068.5 666.5 L 1109.5 666.5 L 1109.5 844.5 L 1068.5 844.5 Z M 820.5 729.5 L 861.5 729.5 L 861.5 844.5 L 820.5 844.5 Z M 953.5 666.5 L 994.5 666.5 L 994.5 844.5 L 953.5 844.5 Z M 953.5 666.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1068.5 228.5 L 1109.5 228.5 L 1109.5 502.5 L 1068.5 502.5 Z M 822.5 387.5 L 863.5 387.5 L 863.5 502.5 L 822.5 502.5 Z M 969.5 228.5 L 1010.5 228.5 L 1010.5 502.5 L 969.5 502.5 Z M 969.5 228.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 687 427 L 734 427 M 687 380 L 734 380 M 687 380 L 687 427 M 734 380 L 734 427 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.svg b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.svg
index 09f616d..edf2cce 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.svg
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 390.5 L 1743.5 390.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 390.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 205.5 652.5 L 221.5 652.5 L 221.5 667.5 L 205.5 667.5 Z M 205.5 652.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1658.5 577.5 L 1672.5 577.5 L 1672.5 638.5 L 1658.5 638.5 Z M 264.5 577.5 L 278.5 577.5 L 278.5 638.5 L 264.5 638.5 Z M 303.5 577.5 L 317.5 577.5 L 317.5 638.5 L 303.5 638.5 Z M 342.5 577.5 L 356.5 577.5 L 356.5 638.5 L 342.5 638.5 Z M 381.5 577.5 L 395.5 577.5 L 395.5 638.5 L 381.5 638.5 Z M 451.5 577.5 L 465.5 577.5 L 465.5 638.5 L 451.5 638.5 Z M 490.5 577.5 L 504.5 577.5 L 504.5 638.5 L 490.5 638.5 Z M 529.5 577.5 L 543.5 577.5 L 543.5 638.5 L 529.5 638.5 Z M 568.5 577.5 L 582.5 577.5 L 582.5 638.5 L 568.5 638.5 Z M 607.5 577.5 L 621.5 577.5 L 621.5 638.5 L 607.5 638.5 Z M 646.5 577.5 L 660.5 577.5 L 660.5 638.5 L 646.5 638.5 Z M 685.5 577.5 L 699.5 577.5 L 699.5 638.5 L 685.5 638.5 Z M 724.5 577.5 L 738.5 577.5 L 738.5 638.5 L 724.5 638.5 Z M 763.5 577.5 L 777.5 577.5 L 777.5 638.5 L 763.5 638.5 Z M 802.5 577.5 L 815.5 577.5 L 815.5 638.5 L 802.5 638.5 Z M 840.5 577.5 L 854.5 577.5 L 854.5 638.5 L 840.5 638.5 Z M 879.5 577.5 L 893.5 577.5 L 893.5 638.5 L 879.5 638.5 Z M 918.5 577.5 L 932.5 577.5 L 932.5 638.5 L 918.5 638.5 Z M 957.5 577.5 L 971.5 577.5 L 971.5 638.5 L 957.5 638.5 Z M 996.5 577.5 L 1010.5 577.5 L 1010.5 638.5 L 996.5 638.5 Z M 1035.5 577.5 L 1049.5 577.5 L 1049.5 638.5 L 1035.5 638.5 Z M 1074.5 577.5 L 1088.5 577.5 L 1088.5 638.5 L 1074.5 638.5 Z M 1113.5 577.5 L 1127.5 577.5 L 1127.5 638.5 L 1113.5 638.5 Z M 1152.5 577.5 L 1166.5 577.5 L 1166.5 638.5 L 1152.5 638.5 Z M 1191.5 577.5 L 1205.5 577.5 L 1205.5 638.5 L 1191.5 638.5 Z M 1230.5 577.5 L 1244.5 577.5 L 1244.5 638.5 L 1230.5 638.5 Z M 1269.5 577.5 L 1282.5 577.5 L 1282.5 638.5 L 1269.5 638.5 Z M 1307.5 577.5 L 1321.5 577.5 L 1321.5 638.5 L 1307.5 638.5 Z M 1346.5 577.5 L 1360.5 577.5 L 1360.5 638.5 L 1346.5 638.5 Z M 1385.5 577.5 L 1399.5 577.5 L 1399.5 638.5 L 1385.5 638.5 Z M 1424.5 577.5 L 1438.5 577.5 L 1438.5 638.5 L 1424.5 638.5 Z M 1463.5 577.5 L 1477.5 577.5 L 1477.5 638.5 L 1463.5 638.5 Z M 1502.5 577.5 L 1516.5 577.5 L 1516.5 638.5 L 1502.5 638.5 Z M 1541.5 577.5 L 1555.5 577.5 L 1555.5 638.5 L 1541.5 638.5 Z M 1580.5 577.5 L 1594.5 577.5 L 1594.5 638.5 L 1580.5 638.5 Z M 1619.5 577.5 L 1633.5 577.5 L 1633.5 638.5 L 1619.5 638.5 Z M 1619.5 577.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1658.5 429.5 L 1672.5 429.5 L 1672.5 522.5 L 1658.5 522.5 Z M 244.5 429.5 L 258.5 429.5 L 258.5 522.5 L 244.5 522.5 Z M 283.5 429.5 L 297.5 429.5 L 297.5 522.5 L 283.5 522.5 Z M 322.5 429.5 L 336.5 429.5 L 336.5 522.5 L 322.5 522.5 Z M 361.5 429.5 L 374.5 429.5 L 374.5 522.5 L 361.5 522.5 Z M 451.5 429.5 L 465.5 429.5 L 465.5 522.5 L 451.5 522.5 Z M 490.5 429.5 L 504.5 429.5 L 504.5 522.5 L 490.5 522.5 Z M 529.5 429.5 L 543.5 429.5 L 543.5 522.5 L 529.5 522.5 Z M 568.5 429.5 L 582.5 429.5 L 582.5 522.5 L 568.5 522.5 Z M 607.5 429.5 L 621.5 429.5 L 621.5 522.5 L 607.5 522.5 Z M 646.5 429.5 L 660.5 429.5 L 660.5 522.5 L 646.5 522.5 Z M 685.5 429.5 L 699.5 429.5 L 699.5 522.5 L 685.5 522.5 Z M 724.5 429.5 L 738.5 429.5 L 738.5 522.5 L 724.5 522.5 Z M 763.5 429.5 L 777.5 429.5 L 777.5 522.5 L 763.5 522.5 Z M 802.5 429.5 L 815.5 429.5 L 815.5 522.5 L 802.5 522.5 Z M 840.5 429.5 L 854.5 429.5 L 854.5 522.5 L 840.5 522.5 Z M 879.5 429.5 L 893.5 429.5 L 893.5 522.5 L 879.5 522.5 Z M 918.5 429.5 L 932.5 429.5 L 932.5 522.5 L 918.5 522.5 Z M 957.5 429.5 L 971.5 429.5 L 971.5 522.5 L 957.5 522.5 Z M 996.5 429.5 L 1010.5 429.5 L 1010.5 522.5 L 996.5 522.5 Z M 1035.5 429.5 L 1049.5 429.5 L 1049.5 522.5 L 1035.5 522.5 Z M 1074.5 429.5 L 1088.5 429.5 L 1088.5 522.5 L 1074.5 522.5 Z M 1113.5 429.5 L 1127.5 429.5 L 1127.5 522.5 L 1113.5 522.5 Z M 1152.5 429.5 L 1166.5 429.5 L 1166.5 522.5 L 1152.5 522.5 Z M 1191.5 429.5 L 1205.5 429.5 L 1205.5 522.5 L 1191.5 522.5 Z M 1230.5 429.5 L 1244.5 429.5 L 1244.5 522.5 L 1230.5 522.5 Z M 1269.5 429.5 L 1282.5 429.5 L 1282.5 522.5 L 1269.5 522.5 Z M 1307.5 429.5 L 1321.5 429.5 L 1321.5 522.5 L 1307.5 522.5 Z M 1346.5 429.5 L 1360.5 429.5 L 1360.5 522.5 L 1346.5 522.5 Z M 1385.5 429.5 L 1399.5 429.5 L 1399.5 522.5 L 1385.5 522.5 Z M 1424.5 429.5 L 1438.5 429.5 L 1438.5 522.5 L 1424.5 522.5 Z M 1463.5 429.5 L 1477.5 429.5 L 1477.5 522.5 L 1463.5 522.5 Z M 1502.5 429.5 L 1516.5 429.5 L 1516.5 522.5 L 1502.5 522.5 Z M 1541.5 429.5 L 1555.5 429.5 L 1555.5 522.5 L 1541.5 522.5 Z M 1580.5 429.5 L 1594.5 429.5 L 1594.5 522.5 L 1580.5 522.5 Z M 1619.5 429.5 L 1633.5 429.5 L 1633.5 522.5 L 1619.5 522.5 Z M 1619.5 429.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 205.5 400.5 L 221.5 400.5 L 221.5 415.5 L 205.5 415.5 Z M 1697.5 400.5 L 1712.5 400.5 L 1712.5 415.5 L 1697.5 415.5 Z M 1654.5 400.5 L 1670.5 400.5 L 1670.5 415.5 L 1654.5 415.5 Z M 1611.5 400.5 L 1627.5 400.5 L 1627.5 415.5 L 1611.5 415.5 Z M 1569.5 400.5 L 1585.5 400.5 L 1585.5 415.5 L 1569.5 415.5 Z M 1526.5 400.5 L 1542.5 400.5 L 1542.5 415.5 L 1526.5 415.5 Z M 1484.5 400.5 L 1499.5 400.5 L 1499.5 415.5 L 1484.5 415.5 Z M 1441.5 400.5 L 1457.5 400.5 L 1457.5 415.5 L 1441.5 415.5 Z M 1398.5 400.5 L 1414.5 400.5 L 1414.5 415.5 L 1398.5 415.5 Z M 1356.5 400.5 L 1371.5 400.5 L 1371.5 415.5 L 1356.5 415.5 Z M 1313.5 400.5 L 1329.5 400.5 L 1329.5 415.5 L 1313.5 415.5 Z M 1270.5 400.5 L 1286.5 400.5 L 1286.5 415.5 L 1270.5 415.5 Z M 1228.5 400.5 L 1244.5 400.5 L 1244.5 415.5 L 1228.5 415.5 Z M 1185.5 400.5 L 1201.5 400.5 L 1201.5 415.5 L 1185.5 415.5 Z M 1143.5 400.5 L 1158.5 400.5 L 1158.5 415.5 L 1143.5 415.5 Z M 1100.5 400.5 L 1116.5 400.5 L 1116.5 415.5 L 1100.5 415.5 Z M 1057.5 400.5 L 1073.5 400.5 L 1073.5 415.5 L 1057.5 415.5 Z M 1015.5 400.5 L 1030.5 400.5 L 1030.5 415.5 L 1015.5 415.5 Z M 972.5 400.5 L 988.5 400.5 L 988.5 415.5 L 972.5 415.5 Z M 929.5 400.5 L 945.5 400.5 L 945.5 415.5 L 929.5 415.5 Z M 887.5 400.5 L 903.5 400.5 L 903.5 415.5 L 887.5 415.5 Z M 844.5 400.5 L 860.5 400.5 L 860.5 415.5 L 844.5 415.5 Z M 802.5 400.5 L 817.5 400.5 L 817.5 415.5 L 802.5 415.5 Z M 759.5 400.5 L 775.5 400.5 L 775.5 415.5 L 759.5 415.5 Z M 716.5 400.5 L 732.5 400.5 L 732.5 415.5 L 716.5 415.5 Z M 674.5 400.5 L 689.5 400.5 L 689.5 415.5 L 674.5 415.5 Z M 631.5 400.5 L 647.5 400.5 L 647.5 415.5 L 631.5 415.5 Z M 588.5 400.5 L 604.5 400.5 L 604.5 415.5 L 588.5 415.5 Z M 546.5 400.5 L 562.5 400.5 L 562.5 415.5 L 546.5 415.5 Z M 503.5 400.5 L 519.5 400.5 L 519.5 415.5 L 503.5 415.5 Z M 461.5 400.5 L 476.5 400.5 L 476.5 415.5 L 461.5 415.5 Z M 418.5 400.5 L 434.5 400.5 L 434.5 415.5 L 418.5 415.5 Z M 375.5 400.5 L 391.5 400.5 L 391.5 415.5 L 375.5 415.5 Z M 333.5 400.5 L 348.5 400.5 L 348.5 415.5 L 333.5 415.5 Z M 290.5 400.5 L 306.5 400.5 L 306.5 415.5 L 290.5 415.5 Z M 248.5 400.5 L 263.5 400.5 L 263.5 415.5 L 248.5 415.5 Z M 205.5 652.5 L 221.5 652.5 L 221.5 667.5 L 205.5 667.5 Z M 1697.5 652.5 L 1712.5 652.5 L 1712.5 667.5 L 1697.5 667.5 Z M 1654.5 652.5 L 1670.5 652.5 L 1670.5 667.5 L 1654.5 667.5 Z M 1611.5 652.5 L 1627.5 652.5 L 1627.5 667.5 L 1611.5 667.5 Z M 1569.5 652.5 L 1585.5 652.5 L 1585.5 667.5 L 1569.5 667.5 Z M 1526.5 652.5 L 1542.5 652.5 L 1542.5 667.5 L 1526.5 667.5 Z M 1484.5 652.5 L 1499.5 652.5 L 1499.5 667.5 L 1484.5 667.5 Z M 1441.5 652.5 L 1457.5 652.5 L 1457.5 667.5 L 1441.5 667.5 Z M 1398.5 652.5 L 1414.5 652.5 L 1414.5 667.5 L 1398.5 667.5 Z M 1356.5 652.5 L 1371.5 652.5 L 1371.5 667.5 L 1356.5 667.5 Z M 1313.5 652.5 L 1329.5 652.5 L 1329.5 667.5 L 1313.5 667.5 Z M 1270.5 652.5 L 1286.5 652.5 L 1286.5 667.5 L 1270.5 667.5 Z M 1228.5 652.5 L 1244.5 652.5 L 1244.5 667.5 L 1228.5 667.5 Z M 1185.5 652.5 L 1201.5 652.5 L 1201.5 667.5 L 1185.5 667.5 Z M 1143.5 652.5 L 1158.5 652.5 L 1158.5 667.5 L 1143.5 667.5 Z M 1100.5 652.5 L 1116.5 652.5 L 1116.5 667.5 L 1100.5 667.5 Z M 1057.5 652.5 L 1073.5 652.5 L 1073.5 667.5 L 1057.5 667.5 Z M 1015.5 652.5 L 1030.5 652.5 L 1030.5 667.5 L 1015.5 667.5 Z M 972.5 652.5 L 988.5 652.5 L 988.5 667.5 L 972.5 667.5 Z M 929.5 652.5 L 945.5 652.5 L 945.5 667.5 L 929.5 667.5 Z M 887.5 652.5 L 903.5 652.5 L 903.5 667.5 L 887.5 667.5 Z M 844.5 652.5 L 860.5 652.5 L 860.5 667.5 L 844.5 667.5 Z M 802.5 652.5 L 817.5 652.5 L 817.5 667.5 L 802.5 667.5 Z M 759.5 652.5 L 775.5 652.5 L 775.5 667.5 L 759.5 667.5 Z M 716.5 652.5 L 732.5 652.5 L 732.5 667.5 L 716.5 667.5 Z M 674.5 652.5 L 689.5 652.5 L 689.5 667.5 L 674.5 667.5 Z M 631.5 652.5 L 647.5 652.5 L 647.5 667.5 L 631.5 667.5 Z M 588.5 652.5 L 604.5 652.5 L 604.5 667.5 L 588.5 667.5 Z M 546.5 652.5 L 562.5 652.5 L 562.5 667.5 L 546.5 667.5 Z M 503.5 652.5 L 519.5 652.5 L 519.5 667.5 L 503.5 667.5 Z M 461.5 652.5 L 476.5 652.5 L 476.5 667.5 L 461.5 667.5 Z M 418.5 652.5 L 434.5 652.5 L 434.5 667.5 L 418.5 667.5 Z M 375.5 652.5 L 391.5 652.5 L 391.5 667.5 L 375.5 667.5 Z M 333.5 652.5 L 348.5 652.5 L 348.5 667.5 L 333.5 667.5 Z M 290.5 652.5 L 306.5 652.5 L 306.5 667.5 L 290.5 667.5 Z M 248.5 652.5 L 263.5 652.5 L 263.5 667.5 L 248.5 667.5 Z M 248.5 652.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 205 679 L 221 679 M 205 664 L 221 664 M 205 664 L 205 679 M 221 664 L 221 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 205 679 L 221 679 M 205 664 L 221 664 M 221 679 L 221 664 M 205 679 L 205 664 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 191 418 L 191 421 M 189 420 L 192 420 " 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 191 415 L 191 424 M 186 420 L 195 420 M 190 421 L 192 421 M 190 419 L 192 419 M 190 419 L 190 421 M 192 419 L 192 421 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.svg b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.svg
index 0aca6e4..c4a8942 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.svg
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1237.5 666.5 L 1278.5 666.5 L 1278.5 781.5 L 1237.5 781.5 Z M 636.5 666.5 L 677.5 666.5 L 677.5 844.5 L 636.5 844.5 Z M 750.5 666.5 L 791.5 666.5 L 791.5 844.5 L 750.5 844.5 Z M 865.5 666.5 L 906.5 666.5 L 906.5 844.5 L 865.5 844.5 Z M 980.5 666.5 L 1021.5 666.5 L 1021.5 844.5 L 980.5 844.5 Z M 980.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1237.5 228.5 L 1278.5 228.5 L 1278.5 343.5 L 1237.5 343.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 750.5 228.5 L 791.5 228.5 L 791.5 502.5 L 750.5 502.5 Z M 865.5 228.5 L 906.5 228.5 L 906.5 502.5 L 865.5 502.5 Z M 980.5 228.5 L 1021.5 228.5 L 1021.5 502.5 L 980.5 502.5 Z M 980.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1318 613 L 1365 613 M 1318 566 L 1365 566 M 1318 566 L 1318 613 M 1365 566 L 1365 613 M 1318 706 L 1365 706 M 1318 659 L 1365 659 M 1318 659 L 1318 706 M 1365 659 L 1365 706 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.svg b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.svg
index 5c223f3..e960518 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.svg
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1451.5 666.5 L 1492.5 666.5 L 1492.5 844.5 L 1451.5 844.5 Z M 381.5 666.5 L 422.5 666.5 L 422.5 844.5 L 381.5 844.5 Z M 496.5 666.5 L 537.5 666.5 L 537.5 844.5 L 496.5 844.5 Z M 611.5 666.5 L 652.5 666.5 L 652.5 844.5 L 611.5 844.5 Z M 726.5 666.5 L 767.5 666.5 L 767.5 844.5 L 726.5 844.5 Z M 841.5 666.5 L 882.5 666.5 L 882.5 844.5 L 841.5 844.5 Z M 956.5 666.5 L 997.5 666.5 L 997.5 844.5 L 956.5 844.5 Z M 1070.5 666.5 L 1111.5 666.5 L 1111.5 844.5 L 1070.5 844.5 Z M 1185.5 666.5 L 1226.5 666.5 L 1226.5 844.5 L 1185.5 844.5 Z M 1185.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1451.5 228.5 L 1492.5 228.5 L 1492.5 502.5 L 1451.5 502.5 Z M 381.5 228.5 L 422.5 228.5 L 422.5 502.5 L 381.5 502.5 Z M 496.5 228.5 L 537.5 228.5 L 537.5 502.5 L 496.5 502.5 Z M 611.5 228.5 L 652.5 228.5 L 652.5 502.5 L 611.5 502.5 Z M 726.5 228.5 L 767.5 228.5 L 767.5 502.5 L 726.5 502.5 Z M 841.5 228.5 L 882.5 228.5 L 882.5 502.5 L 841.5 502.5 Z M 956.5 228.5 L 997.5 228.5 L 997.5 502.5 L 956.5 502.5 Z M 1070.5 228.5 L 1111.5 228.5 L 1111.5 502.5 L 1070.5 502.5 Z M 1185.5 228.5 L 1226.5 228.5 L 1226.5 502.5 L 1185.5 502.5 Z M 1185.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 309 938 L 355 938 M 309 892 L 355 892 M 309 892 L 309 938 M 355 892 L 355 938 " 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 309 938 L 355 938 M 309 892 L 355 892 M 355 938 L 355 892 M 309 938 L 309 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.svg b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.svg
index e7f96e1..172cf3b 100644
--- a/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.svg
+++ b/cells/lpflow_isobufsrc/sky130_fd_sc_hd__lpflow_isobufsrc_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 232.5 754.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1615.5 616.5 L 1641.5 616.5 L 1641.5 728.5 L 1615.5 728.5 Z M 328.5 616.5 L 354.5 616.5 L 354.5 728.5 L 328.5 728.5 Z M 400.5 616.5 L 426.5 616.5 L 426.5 728.5 L 400.5 728.5 Z M 531.5 616.5 L 557.5 616.5 L 557.5 728.5 L 531.5 728.5 Z M 603.5 616.5 L 629.5 616.5 L 629.5 728.5 L 603.5 728.5 Z M 676.5 616.5 L 701.5 616.5 L 701.5 728.5 L 676.5 728.5 Z M 748.5 616.5 L 774.5 616.5 L 774.5 728.5 L 748.5 728.5 Z M 820.5 616.5 L 846.5 616.5 L 846.5 728.5 L 820.5 728.5 Z M 893.5 616.5 L 918.5 616.5 L 918.5 728.5 L 893.5 728.5 Z M 965.5 616.5 L 991.5 616.5 L 991.5 728.5 L 965.5 728.5 Z M 1037.5 616.5 L 1063.5 616.5 L 1063.5 728.5 L 1037.5 728.5 Z M 1109.5 616.5 L 1135.5 616.5 L 1135.5 728.5 L 1109.5 728.5 Z M 1182.5 616.5 L 1207.5 616.5 L 1207.5 728.5 L 1182.5 728.5 Z M 1254.5 616.5 L 1280.5 616.5 L 1280.5 728.5 L 1254.5 728.5 Z M 1326.5 616.5 L 1352.5 616.5 L 1352.5 728.5 L 1326.5 728.5 Z M 1398.5 616.5 L 1424.5 616.5 L 1424.5 728.5 L 1398.5 728.5 Z M 1471.5 616.5 L 1497.5 616.5 L 1497.5 728.5 L 1471.5 728.5 Z M 1543.5 616.5 L 1569.5 616.5 L 1569.5 728.5 L 1543.5 728.5 Z M 1543.5 616.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1615.5 341.5 L 1641.5 341.5 L 1641.5 513.5 L 1615.5 513.5 Z M 287.5 341.5 L 313.5 341.5 L 313.5 513.5 L 287.5 513.5 Z M 359.5 341.5 L 385.5 341.5 L 385.5 513.5 L 359.5 513.5 Z M 531.5 341.5 L 557.5 341.5 L 557.5 513.5 L 531.5 513.5 Z M 603.5 341.5 L 629.5 341.5 L 629.5 513.5 L 603.5 513.5 Z M 676.5 341.5 L 701.5 341.5 L 701.5 513.5 L 676.5 513.5 Z M 748.5 341.5 L 774.5 341.5 L 774.5 513.5 L 748.5 513.5 Z M 820.5 341.5 L 846.5 341.5 L 846.5 513.5 L 820.5 513.5 Z M 893.5 341.5 L 918.5 341.5 L 918.5 513.5 L 893.5 513.5 Z M 965.5 341.5 L 991.5 341.5 L 991.5 513.5 L 965.5 513.5 Z M 1037.5 341.5 L 1063.5 341.5 L 1063.5 513.5 L 1037.5 513.5 Z M 1109.5 341.5 L 1135.5 341.5 L 1135.5 513.5 L 1109.5 513.5 Z M 1182.5 341.5 L 1207.5 341.5 L 1207.5 513.5 L 1182.5 513.5 Z M 1254.5 341.5 L 1280.5 341.5 L 1280.5 513.5 L 1254.5 513.5 Z M 1326.5 341.5 L 1352.5 341.5 L 1352.5 513.5 L 1326.5 513.5 Z M 1398.5 341.5 L 1424.5 341.5 L 1424.5 513.5 L 1398.5 513.5 Z M 1471.5 341.5 L 1497.5 341.5 L 1497.5 513.5 L 1471.5 513.5 Z M 1543.5 341.5 L 1569.5 341.5 L 1569.5 513.5 L 1543.5 513.5 Z M 1543.5 341.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -147,6 +147,5 @@
 <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 232 793 L 261 793 M 232 764 L 261 764 M 232 764 L 232 793 M 261 764 L 261 793 " 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 232 793 L 261 793 M 232 764 L 261 764 M 261 793 L 261 764 M 232 793 L 232 764 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.svg b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.svg
index 86effd7..f31cf39 100644
--- a/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.svg
+++ b/cells/lpflow_isobufsrckapwr/sky130_fd_sc_hd__lpflow_isobufsrckapwr_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 367.5 L 1743.5 367.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 367.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 210.5 670.5 "/>
 </clipPath>
 <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="#image389"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 676.5 585.5 L 692.5 585.5 L 692.5 654.5 L 676.5 654.5 Z M 779.5 609.5 L 796.5 609.5 L 796.5 654.5 L 779.5 654.5 Z M 826.5 609.5 L 842.5 609.5 L 842.5 654.5 L 826.5 654.5 Z M 872.5 609.5 L 888.5 609.5 L 888.5 654.5 L 872.5 654.5 Z M 918.5 609.5 L 934.5 609.5 L 934.5 654.5 L 918.5 654.5 Z M 964.5 609.5 L 980.5 609.5 L 980.5 654.5 L 964.5 654.5 Z M 1010.5 609.5 L 1026.5 609.5 L 1026.5 654.5 L 1010.5 654.5 Z M 1056.5 609.5 L 1072.5 609.5 L 1072.5 654.5 L 1056.5 654.5 Z M 1102.5 609.5 L 1118.5 609.5 L 1118.5 654.5 L 1102.5 654.5 Z M 1148.5 609.5 L 1164.5 609.5 L 1164.5 654.5 L 1148.5 654.5 Z M 1194.5 609.5 L 1210.5 609.5 L 1210.5 654.5 L 1194.5 654.5 Z M 1240.5 609.5 L 1256.5 609.5 L 1256.5 654.5 L 1240.5 654.5 Z M 1286.5 609.5 L 1303.5 609.5 L 1303.5 654.5 L 1286.5 654.5 Z M 1332.5 609.5 L 1348.5 609.5 L 1348.5 654.5 L 1332.5 654.5 Z M 1378.5 609.5 L 1394.5 609.5 L 1394.5 654.5 L 1378.5 654.5 Z M 1424.5 609.5 L 1440.5 609.5 L 1440.5 654.5 L 1424.5 654.5 Z M 1470.5 609.5 L 1486.5 609.5 L 1486.5 654.5 L 1470.5 654.5 Z M 1516.5 609.5 L 1532.5 609.5 L 1532.5 654.5 L 1516.5 654.5 Z M 1563.5 609.5 L 1579.5 609.5 L 1579.5 654.5 L 1563.5 654.5 Z M 1609.5 609.5 L 1625.5 609.5 L 1625.5 654.5 L 1609.5 654.5 Z M 1655.5 609.5 L 1671.5 609.5 L 1671.5 654.5 L 1655.5 654.5 Z M 257.5 585.5 L 273.5 585.5 L 273.5 654.5 L 257.5 654.5 Z M 361.5 585.5 L 377.5 585.5 L 377.5 654.5 L 361.5 654.5 Z M 406.5 585.5 L 422.5 585.5 L 422.5 654.5 L 406.5 654.5 Z M 451.5 585.5 L 467.5 585.5 L 467.5 654.5 L 451.5 654.5 Z M 496.5 585.5 L 512.5 585.5 L 512.5 654.5 L 496.5 654.5 Z M 541.5 585.5 L 557.5 585.5 L 557.5 654.5 L 541.5 654.5 Z M 586.5 585.5 L 602.5 585.5 L 602.5 654.5 L 586.5 654.5 Z M 631.5 585.5 L 647.5 585.5 L 647.5 654.5 L 631.5 654.5 Z M 631.5 585.5 "/>
 </clipPath>
-<image id="image359" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1655.5 413.5 L 1671.5 413.5 L 1671.5 520.5 L 1655.5 520.5 Z M 257.5 413.5 L 273.5 413.5 L 273.5 520.5 L 257.5 520.5 Z M 361.5 413.5 L 377.5 413.5 L 377.5 520.5 L 361.5 520.5 Z M 406.5 413.5 L 422.5 413.5 L 422.5 520.5 L 406.5 520.5 Z M 451.5 413.5 L 467.5 413.5 L 467.5 520.5 L 451.5 520.5 Z M 496.5 413.5 L 512.5 413.5 L 512.5 520.5 L 496.5 520.5 Z M 541.5 413.5 L 557.5 413.5 L 557.5 520.5 L 541.5 520.5 Z M 586.5 413.5 L 602.5 413.5 L 602.5 520.5 L 586.5 520.5 Z M 631.5 413.5 L 647.5 413.5 L 647.5 520.5 L 631.5 520.5 Z M 676.5 413.5 L 692.5 413.5 L 692.5 520.5 L 676.5 520.5 Z M 779.5 413.5 L 796.5 413.5 L 796.5 520.5 L 779.5 520.5 Z M 826.5 413.5 L 842.5 413.5 L 842.5 520.5 L 826.5 520.5 Z M 872.5 413.5 L 888.5 413.5 L 888.5 520.5 L 872.5 520.5 Z M 918.5 413.5 L 934.5 413.5 L 934.5 520.5 L 918.5 520.5 Z M 964.5 413.5 L 980.5 413.5 L 980.5 520.5 L 964.5 520.5 Z M 1010.5 413.5 L 1026.5 413.5 L 1026.5 520.5 L 1010.5 520.5 Z M 1056.5 413.5 L 1072.5 413.5 L 1072.5 520.5 L 1056.5 520.5 Z M 1102.5 413.5 L 1118.5 413.5 L 1118.5 520.5 L 1102.5 520.5 Z M 1148.5 413.5 L 1164.5 413.5 L 1164.5 520.5 L 1148.5 520.5 Z M 1194.5 413.5 L 1210.5 413.5 L 1210.5 520.5 L 1194.5 520.5 Z M 1240.5 413.5 L 1256.5 413.5 L 1256.5 520.5 L 1240.5 520.5 Z M 1286.5 413.5 L 1303.5 413.5 L 1303.5 520.5 L 1286.5 520.5 Z M 1332.5 413.5 L 1348.5 413.5 L 1348.5 520.5 L 1332.5 520.5 Z M 1378.5 413.5 L 1394.5 413.5 L 1394.5 520.5 L 1378.5 520.5 Z M 1424.5 413.5 L 1440.5 413.5 L 1440.5 520.5 L 1424.5 520.5 Z M 1470.5 413.5 L 1486.5 413.5 L 1486.5 520.5 L 1470.5 520.5 Z M 1516.5 413.5 L 1532.5 413.5 L 1532.5 520.5 L 1516.5 520.5 Z M 1563.5 413.5 L 1579.5 413.5 L 1579.5 520.5 L 1563.5 520.5 Z M 1609.5 413.5 L 1625.5 413.5 L 1625.5 520.5 L 1609.5 520.5 Z M 1609.5 413.5 "/>
 </clipPath>
-<image id="image360" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 210.5 379.5 L 228.5 379.5 L 228.5 397.5 L 210.5 397.5 Z M 1689.5 379.5 L 1707.5 379.5 L 1707.5 397.5 L 1689.5 397.5 Z M 1640.5 379.5 L 1658.5 379.5 L 1658.5 397.5 L 1640.5 397.5 Z M 1590.5 379.5 L 1609.5 379.5 L 1609.5 397.5 L 1590.5 397.5 Z M 1541.5 379.5 L 1559.5 379.5 L 1559.5 397.5 L 1541.5 397.5 Z M 1492.5 379.5 L 1510.5 379.5 L 1510.5 397.5 L 1492.5 397.5 Z M 1442.5 379.5 L 1461.5 379.5 L 1461.5 397.5 L 1442.5 397.5 Z M 1393.5 379.5 L 1411.5 379.5 L 1411.5 397.5 L 1393.5 397.5 Z M 1344.5 379.5 L 1362.5 379.5 L 1362.5 397.5 L 1344.5 397.5 Z M 1295.5 379.5 L 1313.5 379.5 L 1313.5 397.5 L 1295.5 397.5 Z M 1245.5 379.5 L 1263.5 379.5 L 1263.5 397.5 L 1245.5 397.5 Z M 1196.5 379.5 L 1214.5 379.5 L 1214.5 397.5 L 1196.5 397.5 Z M 1147.5 379.5 L 1165.5 379.5 L 1165.5 397.5 L 1147.5 397.5 Z M 1097.5 379.5 L 1116.5 379.5 L 1116.5 397.5 L 1097.5 397.5 Z M 1048.5 379.5 L 1066.5 379.5 L 1066.5 397.5 L 1048.5 397.5 Z M 999.5 379.5 L 1017.5 379.5 L 1017.5 397.5 L 999.5 397.5 Z M 949.5 379.5 L 968.5 379.5 L 968.5 397.5 L 949.5 397.5 Z M 900.5 379.5 L 918.5 379.5 L 918.5 397.5 L 900.5 397.5 Z M 851.5 379.5 L 869.5 379.5 L 869.5 397.5 L 851.5 397.5 Z M 801.5 379.5 L 820.5 379.5 L 820.5 397.5 L 801.5 397.5 Z M 752.5 379.5 L 770.5 379.5 L 770.5 397.5 L 752.5 397.5 Z M 703.5 379.5 L 721.5 379.5 L 721.5 397.5 L 703.5 397.5 Z M 653.5 379.5 L 672.5 379.5 L 672.5 397.5 L 653.5 397.5 Z M 604.5 379.5 L 622.5 379.5 L 622.5 397.5 L 604.5 397.5 Z M 555.5 379.5 L 573.5 379.5 L 573.5 397.5 L 555.5 397.5 Z M 506.5 379.5 L 524.5 379.5 L 524.5 397.5 L 506.5 397.5 Z M 456.5 379.5 L 474.5 379.5 L 474.5 397.5 L 456.5 397.5 Z M 407.5 379.5 L 425.5 379.5 L 425.5 397.5 L 407.5 397.5 Z M 358.5 379.5 L 376.5 379.5 L 376.5 397.5 L 358.5 397.5 Z M 308.5 379.5 L 327.5 379.5 L 327.5 397.5 L 308.5 397.5 Z M 259.5 379.5 L 277.5 379.5 L 277.5 397.5 L 259.5 397.5 Z M 755.5 433.5 L 774.5 433.5 L 774.5 438.5 L 755.5 438.5 Z M 939.5 433.5 L 957.5 433.5 L 957.5 438.5 L 939.5 438.5 Z M 848.5 433.5 L 866.5 433.5 L 866.5 438.5 L 848.5 438.5 Z M 1030.5 433.5 L 1049.5 433.5 L 1049.5 451.5 L 1030.5 451.5 Z M 1492.5 433.5 L 1511.5 433.5 L 1511.5 451.5 L 1492.5 451.5 Z M 1678.5 433.5 L 1696.5 433.5 L 1696.5 451.5 L 1678.5 451.5 Z M 1583.5 433.5 L 1602.5 433.5 L 1602.5 451.5 L 1583.5 451.5 Z M 1217.5 433.5 L 1235.5 433.5 L 1235.5 451.5 L 1217.5 451.5 Z M 1401.5 433.5 L 1419.5 433.5 L 1419.5 451.5 L 1401.5 451.5 Z M 1125.5 433.5 L 1143.5 433.5 L 1143.5 451.5 L 1125.5 451.5 Z M 1308.5 433.5 L 1327.5 433.5 L 1327.5 451.5 L 1308.5 451.5 Z M 939.5 438.5 L 957.5 438.5 L 957.5 452.5 L 939.5 452.5 Z M 1030.5 451.5 L 1049.5 451.5 L 1049.5 452.5 L 1030.5 452.5 Z M 1401.5 451.5 L 1419.5 451.5 L 1419.5 452.5 L 1401.5 452.5 Z M 1125.5 451.5 L 1143.5 451.5 L 1143.5 452.5 L 1125.5 452.5 Z M 1217.5 451.5 L 1235.5 451.5 L 1235.5 452.5 L 1217.5 452.5 Z M 755.5 438.5 L 774.5 438.5 L 774.5 452.5 L 755.5 452.5 Z M 1678.5 451.5 L 1696.5 451.5 L 1696.5 452.5 L 1678.5 452.5 Z M 1492.5 451.5 L 1511.5 451.5 L 1511.5 452.5 L 1492.5 452.5 Z M 1583.5 451.5 L 1602.5 451.5 L 1602.5 452.5 L 1583.5 452.5 Z M 848.5 438.5 L 866.5 438.5 L 866.5 452.5 L 848.5 452.5 Z M 1308.5 451.5 L 1327.5 451.5 L 1327.5 452.5 L 1308.5 452.5 Z M 465.5 579.5 L 483.5 579.5 L 483.5 592.5 L 465.5 592.5 Z M 465.5 592.5 L 483.5 592.5 L 483.5 597.5 L 465.5 597.5 Z M 503.5 579.5 L 522.5 579.5 L 522.5 597.5 L 503.5 597.5 Z M 753.5 579.5 L 771.5 579.5 L 771.5 597.5 L 753.5 597.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 1689.5 670.5 L 1707.5 670.5 L 1707.5 689.5 L 1689.5 689.5 Z M 1640.5 670.5 L 1658.5 670.5 L 1658.5 689.5 L 1640.5 689.5 Z M 1590.5 670.5 L 1609.5 670.5 L 1609.5 689.5 L 1590.5 689.5 Z M 1541.5 670.5 L 1559.5 670.5 L 1559.5 689.5 L 1541.5 689.5 Z M 1492.5 670.5 L 1510.5 670.5 L 1510.5 689.5 L 1492.5 689.5 Z M 1442.5 670.5 L 1461.5 670.5 L 1461.5 689.5 L 1442.5 689.5 Z M 1393.5 670.5 L 1411.5 670.5 L 1411.5 689.5 L 1393.5 689.5 Z M 1344.5 670.5 L 1362.5 670.5 L 1362.5 689.5 L 1344.5 689.5 Z M 1295.5 670.5 L 1313.5 670.5 L 1313.5 689.5 L 1295.5 689.5 Z M 1245.5 670.5 L 1263.5 670.5 L 1263.5 689.5 L 1245.5 689.5 Z M 1196.5 670.5 L 1214.5 670.5 L 1214.5 689.5 L 1196.5 689.5 Z M 1147.5 670.5 L 1165.5 670.5 L 1165.5 689.5 L 1147.5 689.5 Z M 1097.5 670.5 L 1116.5 670.5 L 1116.5 689.5 L 1097.5 689.5 Z M 1048.5 670.5 L 1066.5 670.5 L 1066.5 689.5 L 1048.5 689.5 Z M 999.5 670.5 L 1017.5 670.5 L 1017.5 689.5 L 999.5 689.5 Z M 949.5 670.5 L 968.5 670.5 L 968.5 689.5 L 949.5 689.5 Z M 900.5 670.5 L 918.5 670.5 L 918.5 689.5 L 900.5 689.5 Z M 851.5 670.5 L 869.5 670.5 L 869.5 689.5 L 851.5 689.5 Z M 801.5 670.5 L 820.5 670.5 L 820.5 689.5 L 801.5 689.5 Z M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 703.5 670.5 L 721.5 670.5 L 721.5 689.5 L 703.5 689.5 Z M 653.5 670.5 L 672.5 670.5 L 672.5 689.5 L 653.5 689.5 Z M 604.5 670.5 L 622.5 670.5 L 622.5 689.5 L 604.5 689.5 Z M 555.5 670.5 L 573.5 670.5 L 573.5 689.5 L 555.5 689.5 Z M 506.5 670.5 L 524.5 670.5 L 524.5 689.5 L 506.5 689.5 Z M 456.5 670.5 L 474.5 670.5 L 474.5 689.5 L 456.5 689.5 Z M 407.5 670.5 L 425.5 670.5 L 425.5 689.5 L 407.5 689.5 Z M 358.5 670.5 L 376.5 670.5 L 376.5 689.5 L 358.5 689.5 Z M 308.5 670.5 L 327.5 670.5 L 327.5 689.5 L 308.5 689.5 Z M 259.5 670.5 L 277.5 670.5 L 277.5 689.5 L 259.5 689.5 Z M 259.5 670.5 "/>
 </clipPath>
-<image id="image361" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface386">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,5 @@
 <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 208 650 L 234 650 M 208 629 L 234 629 M 208 629 L 208 650 M 234 629 L 234 650 " 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 208 650 L 234 650 M 208 629 L 234 629 M 234 650 L 234 629 M 208 650 L 208 629 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 194 397 L 194 402 M 191 400 L 196 400 " 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 194 395 L 194 404 M 189 400 L 198 400 M 193 401 L 195 401 M 193 399 L 195 399 M 193 399 L 193 401 M 195 399 L 195 401 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.svg b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.svg
index 0fd2fd8..73943ea 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.svg
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1114.5 327.5 L 1466.5 327.5 L 1466.5 746.5 L 1114.5 746.5 Z M 457.5 327.5 L 581.5 327.5 L 581.5 746.5 L 457.5 746.5 Z M 769.5 327.5 L 926.5 327.5 L 926.5 746.5 L 769.5 746.5 Z M 769.5 327.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image381" 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="#image352"/>
+  <use xlink:href="#image381"/>
 </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 506.5 360.5 L 532.5 360.5 L 532.5 377.5 L 506.5 377.5 Z M 1361.5 360.5 L 1387.5 360.5 L 1387.5 377.5 L 1361.5 377.5 Z M 1361.5 377.5 L 1387.5 377.5 L 1387.5 403.5 L 1361.5 403.5 Z M 506.5 377.5 L 532.5 377.5 L 532.5 403.5 L 506.5 403.5 Z M 796.5 389.5 L 899.5 389.5 L 899.5 410.5 L 796.5 410.5 Z M 796.5 410.5 L 899.5 410.5 L 899.5 435.5 L 796.5 435.5 Z M 1361.5 403.5 L 1387.5 403.5 L 1387.5 440.5 L 1361.5 440.5 Z M 506.5 403.5 L 532.5 403.5 L 532.5 440.5 L 506.5 440.5 Z M 796.5 435.5 L 899.5 435.5 L 899.5 455.5 L 796.5 455.5 Z M 1361.5 440.5 L 1387.5 440.5 L 1387.5 465.5 L 1361.5 465.5 Z M 506.5 440.5 L 532.5 440.5 L 532.5 465.5 L 506.5 465.5 Z M 506.5 465.5 L 532.5 465.5 L 532.5 489.5 L 506.5 489.5 Z M 1361.5 465.5 L 1387.5 465.5 L 1387.5 489.5 L 1361.5 489.5 Z M 1361.5 465.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image382" 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="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 506.5 181.5 L 532.5 181.5 L 532.5 216.5 L 506.5 216.5 Z M 1361.5 181.5 L 1387.5 181.5 L 1387.5 216.5 L 1361.5 216.5 Z M 1361.5 216.5 L 1387.5 216.5 L 1387.5 241.5 L 1361.5 241.5 Z M 506.5 216.5 L 532.5 216.5 L 532.5 241.5 L 506.5 241.5 Z M 506.5 241.5 L 532.5 241.5 L 532.5 259.5 L 506.5 259.5 Z M 1361.5 241.5 L 1387.5 241.5 L 1387.5 259.5 L 1361.5 259.5 Z M 506.5 814.5 L 532.5 814.5 L 532.5 832.5 L 506.5 832.5 Z M 1361.5 814.5 L 1387.5 814.5 L 1387.5 832.5 L 1361.5 832.5 Z M 1361.5 832.5 L 1387.5 832.5 L 1387.5 857.5 L 1361.5 857.5 Z M 506.5 832.5 L 532.5 832.5 L 532.5 857.5 L 506.5 857.5 Z M 506.5 857.5 L 532.5 857.5 L 532.5 891.5 L 506.5 891.5 Z M 1361.5 857.5 L 1387.5 857.5 L 1387.5 891.5 L 1361.5 891.5 Z M 1361.5 857.5 "/>
 </clipPath>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 921.5 169.5 L 944.5 169.5 L 944.5 265.5 L 921.5 265.5 Z M 1226.5 169.5 L 1248.5 169.5 L 1248.5 265.5 L 1226.5 265.5 Z M 1112.5 169.5 L 1134.5 169.5 L 1134.5 265.5 L 1112.5 265.5 Z M 1049.5 169.5 L 1071.5 169.5 L 1071.5 265.5 L 1049.5 265.5 Z M 985.5 169.5 L 1007.5 169.5 L 1007.5 265.5 L 985.5 265.5 Z M 838.5 816.5 L 860.5 816.5 L 860.5 878.5 L 838.5 878.5 Z M 1055.5 800.5 L 1077.5 800.5 L 1077.5 896.5 L 1055.5 896.5 Z M 1245.5 800.5 L 1268.5 800.5 L 1268.5 896.5 L 1245.5 896.5 Z M 1118.5 800.5 L 1140.5 800.5 L 1140.5 896.5 L 1118.5 896.5 Z M 1182.5 800.5 L 1204.5 800.5 L 1204.5 896.5 L 1182.5 896.5 Z M 991.5 800.5 L 1013.5 800.5 L 1013.5 896.5 L 991.5 896.5 Z M 991.5 800.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="pattern3" 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="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 1181.5 365.5 L 1203.5 365.5 L 1203.5 482.5 L 1181.5 482.5 Z M 1248.5 365.5 L 1271.5 365.5 L 1271.5 482.5 L 1248.5 482.5 Z M 1181.5 591.5 L 1203.5 591.5 L 1203.5 708.5 L 1181.5 708.5 Z M 1248.5 591.5 L 1270.5 591.5 L 1270.5 708.5 L 1248.5 708.5 Z M 836.5 571.5 L 859.5 571.5 L 859.5 719.5 L 836.5 719.5 Z M 836.5 571.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 506.5 121.5 L 532.5 121.5 L 532.5 147.5 L 506.5 147.5 Z M 1391.5 121.5 L 1416.5 121.5 L 1416.5 147.5 L 1391.5 147.5 Z M 1323.5 121.5 L 1348.5 121.5 L 1348.5 147.5 L 1323.5 147.5 Z M 1255.5 121.5 L 1280.5 121.5 L 1280.5 147.5 L 1255.5 147.5 Z M 1187.5 121.5 L 1212.5 121.5 L 1212.5 147.5 L 1187.5 147.5 Z M 1119.5 121.5 L 1144.5 121.5 L 1144.5 147.5 L 1119.5 147.5 Z M 1051.5 121.5 L 1076.5 121.5 L 1076.5 147.5 L 1051.5 147.5 Z M 983.5 121.5 L 1008.5 121.5 L 1008.5 147.5 L 983.5 147.5 Z M 915.5 121.5 L 940.5 121.5 L 940.5 147.5 L 915.5 147.5 Z M 847.5 121.5 L 872.5 121.5 L 872.5 147.5 L 847.5 147.5 Z M 779.5 121.5 L 804.5 121.5 L 804.5 147.5 L 779.5 147.5 Z M 711.5 121.5 L 736.5 121.5 L 736.5 147.5 L 711.5 147.5 Z M 643.5 121.5 L 668.5 121.5 L 668.5 147.5 L 643.5 147.5 Z M 574.5 121.5 L 600.5 121.5 L 600.5 147.5 L 574.5 147.5 Z M 506.5 398.5 L 531.5 398.5 L 531.5 403.5 L 506.5 403.5 Z M 1362.5 398.5 L 1387.5 398.5 L 1387.5 403.5 L 1362.5 403.5 Z M 506.5 403.5 L 531.5 403.5 L 531.5 423.5 L 506.5 423.5 Z M 1362.5 403.5 L 1387.5 403.5 L 1387.5 423.5 L 1362.5 423.5 Z M 643.5 524.5 L 668.5 524.5 L 668.5 549.5 L 643.5 549.5 Z M 506.5 524.5 L 532.5 524.5 L 532.5 549.5 L 506.5 549.5 Z M 574.5 524.5 L 600.5 524.5 L 600.5 549.5 L 574.5 549.5 Z M 1255.5 524.5 L 1280.5 524.5 L 1280.5 549.5 L 1255.5 549.5 Z M 1323.5 524.5 L 1348.5 524.5 L 1348.5 549.5 L 1323.5 549.5 Z M 1391.5 524.5 L 1416.5 524.5 L 1416.5 549.5 L 1391.5 549.5 Z M 711.5 524.5 L 736.5 524.5 L 736.5 549.5 L 711.5 549.5 Z M 802.5 601.5 L 827.5 601.5 L 827.5 625.5 L 802.5 625.5 Z M 802.5 625.5 L 827.5 625.5 L 827.5 626.5 L 802.5 626.5 Z M 695.5 601.5 L 720.5 601.5 L 720.5 626.5 L 695.5 626.5 Z M 748.5 601.5 L 773.5 601.5 L 773.5 626.5 L 748.5 626.5 Z M 506.5 926.5 L 532.5 926.5 L 532.5 951.5 L 506.5 951.5 Z M 1391.5 926.5 L 1416.5 926.5 L 1416.5 951.5 L 1391.5 951.5 Z M 1323.5 926.5 L 1348.5 926.5 L 1348.5 951.5 L 1323.5 951.5 Z M 1255.5 926.5 L 1280.5 926.5 L 1280.5 951.5 L 1255.5 951.5 Z M 1187.5 926.5 L 1212.5 926.5 L 1212.5 951.5 L 1187.5 951.5 Z M 1119.5 926.5 L 1144.5 926.5 L 1144.5 951.5 L 1119.5 951.5 Z M 1051.5 926.5 L 1076.5 926.5 L 1076.5 951.5 L 1051.5 951.5 Z M 983.5 926.5 L 1008.5 926.5 L 1008.5 951.5 L 983.5 951.5 Z M 915.5 926.5 L 940.5 926.5 L 940.5 951.5 L 915.5 951.5 Z M 847.5 926.5 L 872.5 926.5 L 872.5 951.5 L 847.5 951.5 Z M 779.5 926.5 L 804.5 926.5 L 804.5 951.5 L 779.5 951.5 Z M 711.5 926.5 L 736.5 926.5 L 736.5 951.5 L 711.5 951.5 Z M 643.5 926.5 L 668.5 926.5 L 668.5 951.5 L 643.5 951.5 Z M 574.5 926.5 L 600.5 926.5 L 600.5 951.5 L 574.5 951.5 Z M 574.5 926.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="pattern5" 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="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface378">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,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 1305.5 782.238281 L 1316.71875 798.5 L 1311.71875 798.5 L 1303.066406 785.28125 L 1294.371094 798.5 L 1289.457031 798.5 L 1300.675781 782.238281 L 1290.152344 766.804688 L 1295.066406 766.804688 L 1303.195312 779.238281 L 1311.371094 766.804688 L 1316.195312 766.804688 Z M 1305.5 782.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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1289 284 L 1289 309 M 1314 284 L 1314 309 " 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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1314 309 L 1314 284 M 1289 309 L 1289 284 " 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 485 135 L 485 144 M 480 140 L 489 140 M 484 141 L 486 141 M 484 139 L 486 139 M 484 139 L 484 141 M 486 139 L 486 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.svg b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.svg
index 9c43dc5..29f7c33 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.svg
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1114.5 327.5 L 1466.5 327.5 L 1466.5 746.5 L 1114.5 746.5 Z M 457.5 327.5 L 581.5 327.5 L 581.5 746.5 L 457.5 746.5 Z M 769.5 327.5 L 926.5 327.5 L 926.5 746.5 L 769.5 746.5 Z M 769.5 327.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image383" 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="#image353"/>
+  <use xlink:href="#image383"/>
 </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 506.5 360.5 L 532.5 360.5 L 532.5 377.5 L 506.5 377.5 Z M 1391.5 360.5 L 1416.5 360.5 L 1416.5 377.5 L 1391.5 377.5 Z M 1391.5 377.5 L 1416.5 377.5 L 1416.5 403.5 L 1391.5 403.5 Z M 506.5 377.5 L 532.5 377.5 L 532.5 403.5 L 506.5 403.5 Z M 796.5 389.5 L 899.5 389.5 L 899.5 410.5 L 796.5 410.5 Z M 796.5 410.5 L 899.5 410.5 L 899.5 435.5 L 796.5 435.5 Z M 1391.5 403.5 L 1416.5 403.5 L 1416.5 440.5 L 1391.5 440.5 Z M 506.5 403.5 L 532.5 403.5 L 532.5 440.5 L 506.5 440.5 Z M 796.5 435.5 L 899.5 435.5 L 899.5 455.5 L 796.5 455.5 Z M 1391.5 440.5 L 1416.5 440.5 L 1416.5 465.5 L 1391.5 465.5 Z M 506.5 440.5 L 532.5 440.5 L 532.5 465.5 L 506.5 465.5 Z M 506.5 465.5 L 532.5 465.5 L 532.5 489.5 L 506.5 489.5 Z M 1391.5 465.5 L 1416.5 465.5 L 1416.5 489.5 L 1391.5 489.5 Z M 1391.5 465.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image384" 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="#image354"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 506.5 181.5 L 532.5 181.5 L 532.5 216.5 L 506.5 216.5 Z M 1391.5 181.5 L 1416.5 181.5 L 1416.5 216.5 L 1391.5 216.5 Z M 1391.5 216.5 L 1416.5 216.5 L 1416.5 241.5 L 1391.5 241.5 Z M 506.5 216.5 L 532.5 216.5 L 532.5 241.5 L 506.5 241.5 Z M 506.5 241.5 L 532.5 241.5 L 532.5 259.5 L 506.5 259.5 Z M 1391.5 241.5 L 1416.5 241.5 L 1416.5 259.5 L 1391.5 259.5 Z M 506.5 814.5 L 532.5 814.5 L 532.5 832.5 L 506.5 832.5 Z M 506.5 832.5 L 532.5 832.5 L 532.5 857.5 L 506.5 857.5 Z M 506.5 857.5 L 532.5 857.5 L 532.5 891.5 L 506.5 891.5 Z M 506.5 857.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 921.5 169.5 L 944.5 169.5 L 944.5 265.5 L 921.5 265.5 Z M 1226.5 169.5 L 1248.5 169.5 L 1248.5 265.5 L 1226.5 265.5 Z M 1112.5 169.5 L 1134.5 169.5 L 1134.5 265.5 L 1112.5 265.5 Z M 1049.5 169.5 L 1071.5 169.5 L 1071.5 265.5 L 1049.5 265.5 Z M 985.5 169.5 L 1007.5 169.5 L 1007.5 265.5 L 985.5 265.5 Z M 838.5 816.5 L 860.5 816.5 L 860.5 878.5 L 838.5 878.5 Z M 1055.5 808.5 L 1077.5 808.5 L 1077.5 904.5 L 1055.5 904.5 Z M 1251.5 808.5 L 1273.5 808.5 L 1273.5 904.5 L 1251.5 904.5 Z M 1182.5 808.5 L 1204.5 808.5 L 1204.5 904.5 L 1182.5 904.5 Z M 1118.5 808.5 L 1140.5 808.5 L 1140.5 904.5 L 1118.5 904.5 Z M 1328.5 808.5 L 1350.5 808.5 L 1350.5 904.5 L 1328.5 904.5 Z M 991.5 808.5 L 1013.5 808.5 L 1013.5 904.5 L 991.5 904.5 Z M 991.5 808.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image385"/>
 </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 1181.5 365.5 L 1203.5 365.5 L 1203.5 482.5 L 1181.5 482.5 Z M 1248.5 365.5 L 1271.5 365.5 L 1271.5 482.5 L 1248.5 482.5 Z M 1181.5 591.5 L 1203.5 591.5 L 1203.5 708.5 L 1181.5 708.5 Z M 1328.5 571.5 L 1350.5 571.5 L 1350.5 719.5 L 1328.5 719.5 Z M 1251.5 571.5 L 1273.5 571.5 L 1273.5 719.5 L 1251.5 719.5 Z M 836.5 571.5 L 859.5 571.5 L 859.5 719.5 L 836.5 719.5 Z M 836.5 571.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 506.5 121.5 L 532.5 121.5 L 532.5 147.5 L 506.5 147.5 Z M 1391.5 121.5 L 1416.5 121.5 L 1416.5 147.5 L 1391.5 147.5 Z M 1323.5 121.5 L 1348.5 121.5 L 1348.5 147.5 L 1323.5 147.5 Z M 1255.5 121.5 L 1280.5 121.5 L 1280.5 147.5 L 1255.5 147.5 Z M 1187.5 121.5 L 1212.5 121.5 L 1212.5 147.5 L 1187.5 147.5 Z M 1119.5 121.5 L 1144.5 121.5 L 1144.5 147.5 L 1119.5 147.5 Z M 1051.5 121.5 L 1076.5 121.5 L 1076.5 147.5 L 1051.5 147.5 Z M 983.5 121.5 L 1008.5 121.5 L 1008.5 147.5 L 983.5 147.5 Z M 915.5 121.5 L 940.5 121.5 L 940.5 147.5 L 915.5 147.5 Z M 847.5 121.5 L 872.5 121.5 L 872.5 147.5 L 847.5 147.5 Z M 779.5 121.5 L 804.5 121.5 L 804.5 147.5 L 779.5 147.5 Z M 711.5 121.5 L 736.5 121.5 L 736.5 147.5 L 711.5 147.5 Z M 643.5 121.5 L 668.5 121.5 L 668.5 147.5 L 643.5 147.5 Z M 574.5 121.5 L 600.5 121.5 L 600.5 147.5 L 574.5 147.5 Z M 506.5 398.5 L 531.5 398.5 L 531.5 403.5 L 506.5 403.5 Z M 1383.5 398.5 L 1408.5 398.5 L 1408.5 403.5 L 1383.5 403.5 Z M 506.5 403.5 L 531.5 403.5 L 531.5 423.5 L 506.5 423.5 Z M 1383.5 403.5 L 1408.5 403.5 L 1408.5 423.5 L 1383.5 423.5 Z M 711.5 524.5 L 736.5 524.5 L 736.5 549.5 L 711.5 549.5 Z M 574.5 524.5 L 600.5 524.5 L 600.5 549.5 L 574.5 549.5 Z M 506.5 524.5 L 532.5 524.5 L 532.5 549.5 L 506.5 549.5 Z M 1255.5 524.5 L 1280.5 524.5 L 1280.5 549.5 L 1255.5 549.5 Z M 643.5 524.5 L 668.5 524.5 L 668.5 549.5 L 643.5 549.5 Z M 1391.5 524.5 L 1416.5 524.5 L 1416.5 549.5 L 1391.5 549.5 Z M 1323.5 524.5 L 1348.5 524.5 L 1348.5 549.5 L 1323.5 549.5 Z M 802.5 601.5 L 827.5 601.5 L 827.5 625.5 L 802.5 625.5 Z M 802.5 625.5 L 827.5 625.5 L 827.5 626.5 L 802.5 626.5 Z M 695.5 601.5 L 720.5 601.5 L 720.5 626.5 L 695.5 626.5 Z M 748.5 601.5 L 773.5 601.5 L 773.5 626.5 L 748.5 626.5 Z M 506.5 926.5 L 532.5 926.5 L 532.5 951.5 L 506.5 951.5 Z M 1391.5 926.5 L 1416.5 926.5 L 1416.5 951.5 L 1391.5 951.5 Z M 1323.5 926.5 L 1348.5 926.5 L 1348.5 951.5 L 1323.5 951.5 Z M 1255.5 926.5 L 1280.5 926.5 L 1280.5 951.5 L 1255.5 951.5 Z M 1187.5 926.5 L 1212.5 926.5 L 1212.5 951.5 L 1187.5 951.5 Z M 1119.5 926.5 L 1144.5 926.5 L 1144.5 951.5 L 1119.5 951.5 Z M 1051.5 926.5 L 1076.5 926.5 L 1076.5 951.5 L 1051.5 951.5 Z M 983.5 926.5 L 1008.5 926.5 L 1008.5 951.5 L 983.5 951.5 Z M 915.5 926.5 L 940.5 926.5 L 940.5 951.5 L 915.5 951.5 Z M 847.5 926.5 L 872.5 926.5 L 872.5 951.5 L 847.5 951.5 Z M 779.5 926.5 L 804.5 926.5 L 804.5 951.5 L 779.5 951.5 Z M 711.5 926.5 L 736.5 926.5 L 736.5 951.5 L 711.5 951.5 Z M 643.5 926.5 L 668.5 926.5 L 668.5 951.5 L 643.5 951.5 Z M 574.5 926.5 L 600.5 926.5 L 600.5 951.5 L 574.5 951.5 Z M 574.5 926.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" 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="#image357"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface380">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,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 1305.5 782.238281 L 1316.71875 798.5 L 1311.71875 798.5 L 1303.066406 785.28125 L 1294.371094 798.5 L 1289.457031 798.5 L 1300.675781 782.238281 L 1290.152344 766.804688 L 1295.066406 766.804688 L 1303.195312 779.238281 L 1311.371094 766.804688 L 1316.195312 766.804688 Z M 1305.5 782.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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1289 284 L 1289 309 M 1314 284 L 1314 309 " 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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1314 309 L 1314 284 M 1289 309 L 1289 284 " 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 485 135 L 485 144 M 480 140 L 489 140 M 484 141 L 486 141 M 484 139 L 486 139 M 484 139 L 484 141 M 486 139 L 486 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.svg b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.svg
index d2e18bb..2e2535a 100644
--- a/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.svg
+++ b/cells/lpflow_lsbuf_lh_hl_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1056.5 327.5 L 1523.5 327.5 L 1523.5 746.5 L 1056.5 746.5 Z M 399.5 327.5 L 523.5 327.5 L 523.5 746.5 L 399.5 746.5 Z M 711.5 327.5 L 868.5 327.5 L 868.5 746.5 L 711.5 746.5 Z M 711.5 327.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image383" 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="#image353"/>
+  <use xlink:href="#image383"/>
 </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 449.5 360.5 L 474.5 360.5 L 474.5 377.5 L 449.5 377.5 Z M 1469.5 360.5 L 1495.5 360.5 L 1495.5 377.5 L 1469.5 377.5 Z M 1469.5 377.5 L 1495.5 377.5 L 1495.5 403.5 L 1469.5 403.5 Z M 449.5 377.5 L 474.5 377.5 L 474.5 403.5 L 449.5 403.5 Z M 738.5 389.5 L 841.5 389.5 L 841.5 410.5 L 738.5 410.5 Z M 738.5 410.5 L 841.5 410.5 L 841.5 435.5 L 738.5 435.5 Z M 1469.5 403.5 L 1495.5 403.5 L 1495.5 440.5 L 1469.5 440.5 Z M 449.5 403.5 L 474.5 403.5 L 474.5 440.5 L 449.5 440.5 Z M 738.5 435.5 L 841.5 435.5 L 841.5 455.5 L 738.5 455.5 Z M 1469.5 440.5 L 1495.5 440.5 L 1495.5 465.5 L 1469.5 465.5 Z M 449.5 440.5 L 474.5 440.5 L 474.5 465.5 L 449.5 465.5 Z M 449.5 465.5 L 474.5 465.5 L 474.5 489.5 L 449.5 489.5 Z M 1469.5 465.5 L 1495.5 465.5 L 1495.5 489.5 L 1469.5 489.5 Z M 1469.5 465.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image384" 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="#image354"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 449.5 181.5 L 474.5 181.5 L 474.5 216.5 L 449.5 216.5 Z M 1469.5 181.5 L 1495.5 181.5 L 1495.5 216.5 L 1469.5 216.5 Z M 1469.5 216.5 L 1495.5 216.5 L 1495.5 241.5 L 1469.5 241.5 Z M 449.5 216.5 L 474.5 216.5 L 474.5 241.5 L 449.5 241.5 Z M 449.5 241.5 L 474.5 241.5 L 474.5 259.5 L 449.5 259.5 Z M 1469.5 241.5 L 1495.5 241.5 L 1495.5 259.5 L 1469.5 259.5 Z M 449.5 814.5 L 474.5 814.5 L 474.5 832.5 L 449.5 832.5 Z M 449.5 832.5 L 474.5 832.5 L 474.5 857.5 L 449.5 857.5 Z M 449.5 857.5 L 474.5 857.5 L 474.5 891.5 L 449.5 891.5 Z M 449.5 857.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 864.5 169.5 L 886.5 169.5 L 886.5 265.5 L 864.5 265.5 Z M 1168.5 169.5 L 1191.5 169.5 L 1191.5 265.5 L 1168.5 265.5 Z M 1055.5 169.5 L 1077.5 169.5 L 1077.5 265.5 L 1055.5 265.5 Z M 991.5 169.5 L 1013.5 169.5 L 1013.5 265.5 L 991.5 265.5 Z M 927.5 169.5 L 949.5 169.5 L 949.5 265.5 L 927.5 265.5 Z M 780.5 816.5 L 802.5 816.5 L 802.5 878.5 L 780.5 878.5 Z M 1060.5 808.5 L 1083.5 808.5 L 1083.5 904.5 L 1060.5 904.5 Z M 1334.5 808.5 L 1356.5 808.5 L 1356.5 904.5 L 1334.5 904.5 Z M 1271.5 808.5 L 1293.5 808.5 L 1293.5 904.5 L 1271.5 904.5 Z M 1194.5 808.5 L 1216.5 808.5 L 1216.5 904.5 L 1194.5 904.5 Z M 1124.5 808.5 L 1146.5 808.5 L 1146.5 904.5 L 1124.5 904.5 Z M 933.5 808.5 L 955.5 808.5 L 955.5 904.5 L 933.5 904.5 Z M 997.5 808.5 L 1019.5 808.5 L 1019.5 904.5 L 997.5 904.5 Z M 1398.5 808.5 L 1420.5 808.5 L 1420.5 904.5 L 1398.5 904.5 Z M 1398.5 808.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image385"/>
 </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 1123.5 365.5 L 1146.5 365.5 L 1146.5 482.5 L 1123.5 482.5 Z M 1191.5 365.5 L 1213.5 365.5 L 1213.5 482.5 L 1191.5 482.5 Z M 1123.5 591.5 L 1146.5 591.5 L 1146.5 708.5 L 1123.5 708.5 Z M 1194.5 571.5 L 1216.5 571.5 L 1216.5 719.5 L 1194.5 719.5 Z M 1334.5 571.5 L 1356.5 571.5 L 1356.5 719.5 L 1334.5 719.5 Z M 1271.5 571.5 L 1293.5 571.5 L 1293.5 719.5 L 1271.5 719.5 Z M 779.5 571.5 L 801.5 571.5 L 801.5 719.5 L 779.5 719.5 Z M 1398.5 571.5 L 1420.5 571.5 L 1420.5 719.5 L 1398.5 719.5 Z M 1398.5 571.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 449.5 121.5 L 474.5 121.5 L 474.5 147.5 L 449.5 147.5 Z M 1469.5 121.5 L 1495.5 121.5 L 1495.5 147.5 L 1469.5 147.5 Z M 1401.5 121.5 L 1427.5 121.5 L 1427.5 147.5 L 1401.5 147.5 Z M 1333.5 121.5 L 1359.5 121.5 L 1359.5 147.5 L 1333.5 147.5 Z M 1265.5 121.5 L 1290.5 121.5 L 1290.5 147.5 L 1265.5 147.5 Z M 1197.5 121.5 L 1222.5 121.5 L 1222.5 147.5 L 1197.5 147.5 Z M 1129.5 121.5 L 1154.5 121.5 L 1154.5 147.5 L 1129.5 147.5 Z M 1061.5 121.5 L 1086.5 121.5 L 1086.5 147.5 L 1061.5 147.5 Z M 993.5 121.5 L 1018.5 121.5 L 1018.5 147.5 L 993.5 147.5 Z M 925.5 121.5 L 950.5 121.5 L 950.5 147.5 L 925.5 147.5 Z M 857.5 121.5 L 882.5 121.5 L 882.5 147.5 L 857.5 147.5 Z M 789.5 121.5 L 814.5 121.5 L 814.5 147.5 L 789.5 147.5 Z M 721.5 121.5 L 746.5 121.5 L 746.5 147.5 L 721.5 147.5 Z M 653.5 121.5 L 678.5 121.5 L 678.5 147.5 L 653.5 147.5 Z M 585.5 121.5 L 610.5 121.5 L 610.5 147.5 L 585.5 147.5 Z M 517.5 121.5 L 542.5 121.5 L 542.5 147.5 L 517.5 147.5 Z M 448.5 398.5 L 473.5 398.5 L 473.5 403.5 L 448.5 403.5 Z M 1461.5 398.5 L 1487.5 398.5 L 1487.5 403.5 L 1461.5 403.5 Z M 1461.5 403.5 L 1487.5 403.5 L 1487.5 423.5 L 1461.5 423.5 Z M 448.5 403.5 L 473.5 403.5 L 473.5 423.5 L 448.5 423.5 Z M 653.5 524.5 L 678.5 524.5 L 678.5 549.5 L 653.5 549.5 Z M 1265.5 524.5 L 1290.5 524.5 L 1290.5 549.5 L 1265.5 549.5 Z M 585.5 524.5 L 610.5 524.5 L 610.5 549.5 L 585.5 549.5 Z M 517.5 524.5 L 542.5 524.5 L 542.5 549.5 L 517.5 549.5 Z M 449.5 524.5 L 474.5 524.5 L 474.5 549.5 L 449.5 549.5 Z M 1197.5 524.5 L 1222.5 524.5 L 1222.5 549.5 L 1197.5 549.5 Z M 1401.5 524.5 L 1427.5 524.5 L 1427.5 549.5 L 1401.5 549.5 Z M 1333.5 524.5 L 1359.5 524.5 L 1359.5 549.5 L 1333.5 549.5 Z M 1469.5 524.5 L 1495.5 524.5 L 1495.5 549.5 L 1469.5 549.5 Z M 744.5 601.5 L 769.5 601.5 L 769.5 625.5 L 744.5 625.5 Z M 744.5 625.5 L 769.5 625.5 L 769.5 626.5 L 744.5 626.5 Z M 637.5 601.5 L 662.5 601.5 L 662.5 626.5 L 637.5 626.5 Z M 691.5 601.5 L 716.5 601.5 L 716.5 626.5 L 691.5 626.5 Z M 449.5 926.5 L 474.5 926.5 L 474.5 951.5 L 449.5 951.5 Z M 1469.5 926.5 L 1495.5 926.5 L 1495.5 951.5 L 1469.5 951.5 Z M 1401.5 926.5 L 1427.5 926.5 L 1427.5 951.5 L 1401.5 951.5 Z M 1333.5 926.5 L 1359.5 926.5 L 1359.5 951.5 L 1333.5 951.5 Z M 1265.5 926.5 L 1290.5 926.5 L 1290.5 951.5 L 1265.5 951.5 Z M 1197.5 926.5 L 1222.5 926.5 L 1222.5 951.5 L 1197.5 951.5 Z M 1129.5 926.5 L 1154.5 926.5 L 1154.5 951.5 L 1129.5 951.5 Z M 1061.5 926.5 L 1086.5 926.5 L 1086.5 951.5 L 1061.5 951.5 Z M 993.5 926.5 L 1018.5 926.5 L 1018.5 951.5 L 993.5 951.5 Z M 925.5 926.5 L 950.5 926.5 L 950.5 951.5 L 925.5 951.5 Z M 857.5 926.5 L 882.5 926.5 L 882.5 951.5 L 857.5 951.5 Z M 789.5 926.5 L 814.5 926.5 L 814.5 951.5 L 789.5 951.5 Z M 721.5 926.5 L 746.5 926.5 L 746.5 951.5 L 721.5 951.5 Z M 653.5 926.5 L 678.5 926.5 L 678.5 951.5 L 653.5 951.5 Z M 585.5 926.5 L 610.5 926.5 L 610.5 951.5 L 585.5 951.5 Z M 517.5 926.5 L 542.5 926.5 L 542.5 951.5 L 517.5 951.5 Z M 517.5 926.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" 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="#image357"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface380">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,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 1247.5 782.238281 L 1258.71875 798.5 L 1253.71875 798.5 L 1245.066406 785.28125 L 1236.371094 798.5 L 1231.457031 798.5 L 1242.675781 782.238281 L 1232.152344 766.804688 L 1237.066406 766.804688 L 1245.195312 779.238281 L 1253.371094 766.804688 L 1258.195312 766.804688 Z M 1247.5 782.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 1231 309 L 1256 309 M 1231 284 L 1256 284 M 1231 284 L 1231 309 M 1256 284 L 1256 309 " 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 1231 309 L 1256 309 M 1231 284 L 1256 284 M 1256 309 L 1256 284 M 1231 309 L 1231 284 " 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 427 135 L 427 144 M 422 140 L 431 140 M 426 141 L 428 141 M 426 139 L 428 139 M 426 139 L 426 141 M 428 139 L 428 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.svg b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.svg
index 2dcdffa..8e0aa19 100644
--- a/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.svg
+++ b/cells/lpflow_lsbuf_lh_isowell/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1056.5 327.5 L 1523.5 327.5 L 1523.5 746.5 L 1056.5 746.5 Z M 399.5 327.5 L 523.5 327.5 L 523.5 746.5 L 399.5 746.5 Z M 711.5 327.5 L 868.5 327.5 L 868.5 746.5 L 711.5 746.5 Z M 711.5 327.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" 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="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 438.5 141.5 L 457.5 141.5 L 457.5 163.5 L 438.5 163.5 Z M 438.5 141.5 "/>
 </clipPath>
 <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="#image398"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,9 +32,9 @@
 <clipPath id="clip6">
   <path d="M 738.5 389.5 L 841.5 389.5 L 841.5 410.5 L 738.5 410.5 Z M 738.5 410.5 L 841.5 410.5 L 841.5 435.5 L 738.5 435.5 Z M 738.5 435.5 L 841.5 435.5 L 841.5 455.5 L 738.5 455.5 Z M 738.5 435.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <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="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 864.5 169.5 L 886.5 169.5 L 886.5 265.5 L 864.5 265.5 Z M 1168.5 169.5 L 1191.5 169.5 L 1191.5 265.5 L 1168.5 265.5 Z M 1055.5 169.5 L 1077.5 169.5 L 1077.5 265.5 L 1055.5 265.5 Z M 991.5 169.5 L 1013.5 169.5 L 1013.5 265.5 L 991.5 265.5 Z M 927.5 169.5 L 949.5 169.5 L 949.5 265.5 L 927.5 265.5 Z M 780.5 816.5 L 802.5 816.5 L 802.5 878.5 L 780.5 878.5 Z M 1060.5 808.5 L 1083.5 808.5 L 1083.5 904.5 L 1060.5 904.5 Z M 1334.5 808.5 L 1356.5 808.5 L 1356.5 904.5 L 1334.5 904.5 Z M 1271.5 808.5 L 1293.5 808.5 L 1293.5 904.5 L 1271.5 904.5 Z M 1194.5 808.5 L 1216.5 808.5 L 1216.5 904.5 L 1194.5 904.5 Z M 1124.5 808.5 L 1146.5 808.5 L 1146.5 904.5 L 1124.5 904.5 Z M 933.5 808.5 L 955.5 808.5 L 955.5 904.5 L 933.5 904.5 Z M 997.5 808.5 L 1019.5 808.5 L 1019.5 904.5 L 997.5 904.5 Z M 1398.5 808.5 L 1420.5 808.5 L 1420.5 904.5 L 1398.5 904.5 Z M 1398.5 808.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <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 1123.5 365.5 L 1146.5 365.5 L 1146.5 482.5 L 1123.5 482.5 Z M 1191.5 365.5 L 1213.5 365.5 L 1213.5 482.5 L 1191.5 482.5 Z M 1123.5 591.5 L 1146.5 591.5 L 1146.5 708.5 L 1123.5 708.5 Z M 1194.5 571.5 L 1216.5 571.5 L 1216.5 719.5 L 1194.5 719.5 Z M 1334.5 571.5 L 1356.5 571.5 L 1356.5 719.5 L 1334.5 719.5 Z M 1271.5 571.5 L 1293.5 571.5 L 1293.5 719.5 L 1271.5 719.5 Z M 779.5 571.5 L 801.5 571.5 L 801.5 719.5 L 779.5 719.5 Z M 1398.5 571.5 L 1420.5 571.5 L 1420.5 719.5 L 1398.5 719.5 Z M 1398.5 571.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 449.5 121.5 L 474.5 121.5 L 474.5 147.5 L 449.5 147.5 Z M 1469.5 121.5 L 1495.5 121.5 L 1495.5 147.5 L 1469.5 147.5 Z M 1401.5 121.5 L 1427.5 121.5 L 1427.5 147.5 L 1401.5 147.5 Z M 1333.5 121.5 L 1359.5 121.5 L 1359.5 147.5 L 1333.5 147.5 Z M 1265.5 121.5 L 1290.5 121.5 L 1290.5 147.5 L 1265.5 147.5 Z M 1197.5 121.5 L 1222.5 121.5 L 1222.5 147.5 L 1197.5 147.5 Z M 1129.5 121.5 L 1154.5 121.5 L 1154.5 147.5 L 1129.5 147.5 Z M 1061.5 121.5 L 1086.5 121.5 L 1086.5 147.5 L 1061.5 147.5 Z M 993.5 121.5 L 1018.5 121.5 L 1018.5 147.5 L 993.5 147.5 Z M 925.5 121.5 L 950.5 121.5 L 950.5 147.5 L 925.5 147.5 Z M 857.5 121.5 L 882.5 121.5 L 882.5 147.5 L 857.5 147.5 Z M 789.5 121.5 L 814.5 121.5 L 814.5 147.5 L 789.5 147.5 Z M 721.5 121.5 L 746.5 121.5 L 746.5 147.5 L 721.5 147.5 Z M 653.5 121.5 L 678.5 121.5 L 678.5 147.5 L 653.5 147.5 Z M 585.5 121.5 L 610.5 121.5 L 610.5 147.5 L 585.5 147.5 Z M 517.5 121.5 L 542.5 121.5 L 542.5 147.5 L 517.5 147.5 Z M 449.5 524.5 L 474.5 524.5 L 474.5 549.5 L 449.5 549.5 Z M 1197.5 524.5 L 1222.5 524.5 L 1222.5 549.5 L 1197.5 549.5 Z M 1265.5 524.5 L 1290.5 524.5 L 1290.5 549.5 L 1265.5 549.5 Z M 1333.5 524.5 L 1359.5 524.5 L 1359.5 549.5 L 1333.5 549.5 Z M 1401.5 524.5 L 1427.5 524.5 L 1427.5 549.5 L 1401.5 549.5 Z M 1469.5 524.5 L 1495.5 524.5 L 1495.5 549.5 L 1469.5 549.5 Z M 653.5 524.5 L 678.5 524.5 L 678.5 549.5 L 653.5 549.5 Z M 585.5 524.5 L 610.5 524.5 L 610.5 549.5 L 585.5 549.5 Z M 517.5 524.5 L 542.5 524.5 L 542.5 549.5 L 517.5 549.5 Z M 744.5 601.5 L 769.5 601.5 L 769.5 625.5 L 744.5 625.5 Z M 744.5 625.5 L 769.5 625.5 L 769.5 626.5 L 744.5 626.5 Z M 637.5 601.5 L 662.5 601.5 L 662.5 626.5 L 637.5 626.5 Z M 691.5 601.5 L 716.5 601.5 L 716.5 626.5 L 691.5 626.5 Z M 449.5 926.5 L 474.5 926.5 L 474.5 951.5 L 449.5 951.5 Z M 1469.5 926.5 L 1495.5 926.5 L 1495.5 951.5 L 1469.5 951.5 Z M 1401.5 926.5 L 1427.5 926.5 L 1427.5 951.5 L 1401.5 951.5 Z M 1333.5 926.5 L 1359.5 926.5 L 1359.5 951.5 L 1333.5 951.5 Z M 1265.5 926.5 L 1290.5 926.5 L 1290.5 951.5 L 1265.5 951.5 Z M 1197.5 926.5 L 1222.5 926.5 L 1222.5 951.5 L 1197.5 951.5 Z M 1129.5 926.5 L 1154.5 926.5 L 1154.5 951.5 L 1129.5 951.5 Z M 1061.5 926.5 L 1086.5 926.5 L 1086.5 951.5 L 1061.5 951.5 Z M 993.5 926.5 L 1018.5 926.5 L 1018.5 951.5 L 993.5 951.5 Z M 925.5 926.5 L 950.5 926.5 L 950.5 951.5 L 925.5 951.5 Z M 857.5 926.5 L 882.5 926.5 L 882.5 951.5 L 857.5 951.5 Z M 789.5 926.5 L 814.5 926.5 L 814.5 951.5 L 789.5 951.5 Z M 721.5 926.5 L 746.5 926.5 L 746.5 951.5 L 721.5 951.5 Z M 653.5 926.5 L 678.5 926.5 L 678.5 951.5 L 653.5 951.5 Z M 585.5 926.5 L 610.5 926.5 L 610.5 951.5 L 585.5 951.5 Z M 517.5 926.5 L 542.5 926.5 L 542.5 951.5 L 517.5 951.5 Z M 517.5 926.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image402" 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="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface366">
+<g id="surface395">
 <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 473.242188 156.25 L 473.191406 157.058594 L 473.066406 157.789062 L 472.839844 158.46875 L 472.535156 159.078125 L 472.132812 159.65625 L 471.652344 160.160156 L 471.121094 160.589844 L 470.566406 160.917969 L 469.9375 161.171875 L 469.28125 161.375 L 468.574219 161.476562 L 467.816406 161.5 L 459.511719 161.5 L 459.511719 143.097656 L 466.984375 143.097656 L 468.066406 143.171875 L 469.027344 143.347656 L 469.886719 143.652344 L 470.617188 144.082031 L 471.25 144.636719 L 471.753906 145.316406 L 471.957031 145.695312 L 472.132812 146.101562 L 472.257812 146.480469 L 472.359375 146.90625 L 472.410156 147.335938 L 472.433594 147.765625 L 472.359375 148.675781 L 472.132812 149.457031 L 471.777344 150.191406 L 471.273438 150.796875 L 470.644531 151.351562 L 469.886719 151.78125 L 470.617188 152.109375 L 471.25 152.460938 L 471.804688 152.867188 L 472.257812 153.320312 L 472.613281 153.800781 L 472.890625 154.304688 L 472.992188 154.609375 L 473.066406 154.910156 L 473.140625 155.214844 L 473.191406 155.566406 L 473.21875 155.894531 Z M 470.085938 148.09375 L 470.011719 147.335938 L 469.785156 146.707031 L 469.429688 146.152344 L 468.925781 145.746094 L 468.296875 145.445312 L 467.511719 145.242188 L 467.335938 145.242188 L 467.160156 145.214844 L 466.984375 145.191406 L 466.578125 145.191406 L 466.402344 145.167969 L 461.859375 145.167969 L 461.859375 151.023438 L 466.402344 151.023438 L 467.335938 150.972656 L 468.144531 150.820312 L 468.824219 150.542969 L 469.332031 150.164062 L 469.734375 149.660156 L 469.988281 149.054688 L 470.011719 148.929688 L 470.039062 148.777344 L 470.0625 148.625 L 470.0625 148.269531 Z M 467.589844 159.429688 L 468.296875 159.40625 L 468.925781 159.253906 L 469.480469 159 L 469.9375 158.671875 L 470.316406 158.242188 L 470.617188 157.714844 L 470.695312 157.511719 L 470.742188 157.285156 L 470.820312 157.03125 L 470.84375 156.804688 L 470.871094 156.550781 L 470.894531 156.273438 L 470.84375 155.71875 L 470.742188 155.1875 L 470.566406 154.734375 L 470.316406 154.304688 L 469.988281 153.953125 L 469.609375 153.625 L 469.332031 153.472656 L 469.027344 153.347656 L 468.699219 153.246094 L 468.347656 153.167969 L 467.96875 153.117188 L 467.589844 153.09375 L 461.859375 153.09375 L 461.859375 159.429688 Z M 467.589844 159.429688 "/>
 <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 438 938 L 457 938 M 438 916 L 457 916 M 438 916 L 438 938 M 457 916 L 457 938 " 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 438 938 L 457 938 M 438 916 L 457 916 M 457 938 L 457 916 M 438 938 L 438 916 " 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 427 135 L 427 144 M 422 140 L 431 140 M 426 141 L 428 141 M 426 139 L 428 139 M 426 139 L 426 141 M 428 139 L 428 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.svg b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.svg
index d58a717..c4013ac 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.svg
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1114.5 327.5 L 1466.5 327.5 L 1466.5 746.5 L 1114.5 746.5 Z M 457.5 327.5 L 581.5 327.5 L 581.5 746.5 L 457.5 746.5 Z M 769.5 327.5 L 926.5 327.5 L 926.5 746.5 L 769.5 746.5 Z M 769.5 327.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image387" 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="#image358"/>
+  <use xlink:href="#image387"/>
 </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 506.5 360.5 L 532.5 360.5 L 532.5 377.5 L 506.5 377.5 Z M 1361.5 360.5 L 1387.5 360.5 L 1387.5 377.5 L 1361.5 377.5 Z M 1361.5 377.5 L 1387.5 377.5 L 1387.5 403.5 L 1361.5 403.5 Z M 506.5 377.5 L 532.5 377.5 L 532.5 403.5 L 506.5 403.5 Z M 796.5 389.5 L 899.5 389.5 L 899.5 410.5 L 796.5 410.5 Z M 796.5 410.5 L 899.5 410.5 L 899.5 435.5 L 796.5 435.5 Z M 1361.5 403.5 L 1387.5 403.5 L 1387.5 440.5 L 1361.5 440.5 Z M 506.5 403.5 L 532.5 403.5 L 532.5 440.5 L 506.5 440.5 Z M 796.5 435.5 L 899.5 435.5 L 899.5 455.5 L 796.5 455.5 Z M 1361.5 440.5 L 1387.5 440.5 L 1387.5 465.5 L 1361.5 465.5 Z M 506.5 440.5 L 532.5 440.5 L 532.5 465.5 L 506.5 465.5 Z M 506.5 465.5 L 532.5 465.5 L 532.5 489.5 L 506.5 489.5 Z M 1361.5 465.5 L 1387.5 465.5 L 1387.5 489.5 L 1361.5 489.5 Z M 1361.5 465.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image388" 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="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 506.5 181.5 L 532.5 181.5 L 532.5 216.5 L 506.5 216.5 Z M 1361.5 181.5 L 1387.5 181.5 L 1387.5 216.5 L 1361.5 216.5 Z M 1361.5 216.5 L 1387.5 216.5 L 1387.5 241.5 L 1361.5 241.5 Z M 506.5 216.5 L 532.5 216.5 L 532.5 241.5 L 506.5 241.5 Z M 506.5 241.5 L 532.5 241.5 L 532.5 259.5 L 506.5 259.5 Z M 1361.5 241.5 L 1387.5 241.5 L 1387.5 259.5 L 1361.5 259.5 Z M 506.5 814.5 L 532.5 814.5 L 532.5 832.5 L 506.5 832.5 Z M 1361.5 814.5 L 1387.5 814.5 L 1387.5 832.5 L 1361.5 832.5 Z M 1361.5 832.5 L 1387.5 832.5 L 1387.5 857.5 L 1361.5 857.5 Z M 506.5 832.5 L 532.5 832.5 L 532.5 857.5 L 506.5 857.5 Z M 506.5 857.5 L 532.5 857.5 L 532.5 891.5 L 506.5 891.5 Z M 1361.5 857.5 L 1387.5 857.5 L 1387.5 891.5 L 1361.5 891.5 Z M 1361.5 857.5 "/>
 </clipPath>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 921.5 169.5 L 944.5 169.5 L 944.5 265.5 L 921.5 265.5 Z M 1226.5 169.5 L 1248.5 169.5 L 1248.5 265.5 L 1226.5 265.5 Z M 1112.5 169.5 L 1134.5 169.5 L 1134.5 265.5 L 1112.5 265.5 Z M 1049.5 169.5 L 1071.5 169.5 L 1071.5 265.5 L 1049.5 265.5 Z M 985.5 169.5 L 1007.5 169.5 L 1007.5 265.5 L 985.5 265.5 Z M 838.5 816.5 L 860.5 816.5 L 860.5 878.5 L 838.5 878.5 Z M 1055.5 800.5 L 1077.5 800.5 L 1077.5 896.5 L 1055.5 896.5 Z M 1245.5 800.5 L 1268.5 800.5 L 1268.5 896.5 L 1245.5 896.5 Z M 1118.5 800.5 L 1140.5 800.5 L 1140.5 896.5 L 1118.5 896.5 Z M 1182.5 800.5 L 1204.5 800.5 L 1204.5 896.5 L 1182.5 896.5 Z M 991.5 800.5 L 1013.5 800.5 L 1013.5 896.5 L 991.5 896.5 Z M 991.5 800.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="pattern3" 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="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 1181.5 365.5 L 1203.5 365.5 L 1203.5 482.5 L 1181.5 482.5 Z M 1248.5 365.5 L 1271.5 365.5 L 1271.5 482.5 L 1248.5 482.5 Z M 1181.5 591.5 L 1203.5 591.5 L 1203.5 708.5 L 1181.5 708.5 Z M 1248.5 591.5 L 1270.5 591.5 L 1270.5 708.5 L 1248.5 708.5 Z M 836.5 571.5 L 859.5 571.5 L 859.5 719.5 L 836.5 719.5 Z M 836.5 571.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 506.5 121.5 L 532.5 121.5 L 532.5 147.5 L 506.5 147.5 Z M 1391.5 121.5 L 1416.5 121.5 L 1416.5 147.5 L 1391.5 147.5 Z M 1323.5 121.5 L 1348.5 121.5 L 1348.5 147.5 L 1323.5 147.5 Z M 1255.5 121.5 L 1280.5 121.5 L 1280.5 147.5 L 1255.5 147.5 Z M 1187.5 121.5 L 1212.5 121.5 L 1212.5 147.5 L 1187.5 147.5 Z M 1119.5 121.5 L 1144.5 121.5 L 1144.5 147.5 L 1119.5 147.5 Z M 1051.5 121.5 L 1076.5 121.5 L 1076.5 147.5 L 1051.5 147.5 Z M 983.5 121.5 L 1008.5 121.5 L 1008.5 147.5 L 983.5 147.5 Z M 915.5 121.5 L 940.5 121.5 L 940.5 147.5 L 915.5 147.5 Z M 847.5 121.5 L 872.5 121.5 L 872.5 147.5 L 847.5 147.5 Z M 779.5 121.5 L 804.5 121.5 L 804.5 147.5 L 779.5 147.5 Z M 711.5 121.5 L 736.5 121.5 L 736.5 147.5 L 711.5 147.5 Z M 643.5 121.5 L 668.5 121.5 L 668.5 147.5 L 643.5 147.5 Z M 574.5 121.5 L 600.5 121.5 L 600.5 147.5 L 574.5 147.5 Z M 506.5 398.5 L 531.5 398.5 L 531.5 403.5 L 506.5 403.5 Z M 1362.5 398.5 L 1387.5 398.5 L 1387.5 403.5 L 1362.5 403.5 Z M 506.5 403.5 L 531.5 403.5 L 531.5 423.5 L 506.5 423.5 Z M 1362.5 403.5 L 1387.5 403.5 L 1387.5 423.5 L 1362.5 423.5 Z M 643.5 524.5 L 668.5 524.5 L 668.5 549.5 L 643.5 549.5 Z M 506.5 524.5 L 532.5 524.5 L 532.5 549.5 L 506.5 549.5 Z M 574.5 524.5 L 600.5 524.5 L 600.5 549.5 L 574.5 549.5 Z M 1255.5 524.5 L 1280.5 524.5 L 1280.5 549.5 L 1255.5 549.5 Z M 1323.5 524.5 L 1348.5 524.5 L 1348.5 549.5 L 1323.5 549.5 Z M 1391.5 524.5 L 1416.5 524.5 L 1416.5 549.5 L 1391.5 549.5 Z M 711.5 524.5 L 736.5 524.5 L 736.5 549.5 L 711.5 549.5 Z M 802.5 601.5 L 827.5 601.5 L 827.5 625.5 L 802.5 625.5 Z M 802.5 625.5 L 827.5 625.5 L 827.5 626.5 L 802.5 626.5 Z M 695.5 601.5 L 720.5 601.5 L 720.5 626.5 L 695.5 626.5 Z M 748.5 601.5 L 773.5 601.5 L 773.5 626.5 L 748.5 626.5 Z M 506.5 926.5 L 532.5 926.5 L 532.5 951.5 L 506.5 951.5 Z M 1391.5 926.5 L 1416.5 926.5 L 1416.5 951.5 L 1391.5 951.5 Z M 1323.5 926.5 L 1348.5 926.5 L 1348.5 951.5 L 1323.5 951.5 Z M 1255.5 926.5 L 1280.5 926.5 L 1280.5 951.5 L 1255.5 951.5 Z M 1187.5 926.5 L 1212.5 926.5 L 1212.5 951.5 L 1187.5 951.5 Z M 1119.5 926.5 L 1144.5 926.5 L 1144.5 951.5 L 1119.5 951.5 Z M 1051.5 926.5 L 1076.5 926.5 L 1076.5 951.5 L 1051.5 951.5 Z M 983.5 926.5 L 1008.5 926.5 L 1008.5 951.5 L 983.5 951.5 Z M 915.5 926.5 L 940.5 926.5 L 940.5 951.5 L 915.5 951.5 Z M 847.5 926.5 L 872.5 926.5 L 872.5 951.5 L 847.5 951.5 Z M 779.5 926.5 L 804.5 926.5 L 804.5 951.5 L 779.5 951.5 Z M 711.5 926.5 L 736.5 926.5 L 736.5 951.5 L 711.5 951.5 Z M 643.5 926.5 L 668.5 926.5 L 668.5 951.5 L 643.5 951.5 Z M 574.5 926.5 L 600.5 926.5 L 600.5 951.5 L 574.5 951.5 Z M 574.5 926.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="pattern5" 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="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface384">
 <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 1305.5 782.238281 L 1316.71875 798.5 L 1311.71875 798.5 L 1303.066406 785.28125 L 1294.371094 798.5 L 1289.457031 798.5 L 1300.675781 782.238281 L 1290.152344 766.804688 L 1295.066406 766.804688 L 1303.195312 779.238281 L 1311.371094 766.804688 L 1316.195312 766.804688 Z M 1305.5 782.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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1289 284 L 1289 309 M 1314 284 L 1314 309 " 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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1314 309 L 1314 284 M 1289 309 L 1289 284 " 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 485 135 L 485 144 M 480 140 L 489 140 M 484 141 L 486 141 M 484 139 L 486 139 M 484 139 L 484 141 M 486 139 L 486 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.svg b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.svg
index 3bea27e..8a1b0d4 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.svg
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1114.5 327.5 L 1466.5 327.5 L 1466.5 746.5 L 1114.5 746.5 Z M 457.5 327.5 L 581.5 327.5 L 581.5 746.5 L 457.5 746.5 Z M 769.5 327.5 L 926.5 327.5 L 926.5 746.5 L 769.5 746.5 Z M 769.5 327.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 506.5 360.5 L 532.5 360.5 L 532.5 377.5 L 506.5 377.5 Z M 1391.5 360.5 L 1416.5 360.5 L 1416.5 377.5 L 1391.5 377.5 Z M 1391.5 377.5 L 1416.5 377.5 L 1416.5 403.5 L 1391.5 403.5 Z M 506.5 377.5 L 532.5 377.5 L 532.5 403.5 L 506.5 403.5 Z M 796.5 389.5 L 899.5 389.5 L 899.5 410.5 L 796.5 410.5 Z M 796.5 410.5 L 899.5 410.5 L 899.5 435.5 L 796.5 435.5 Z M 1391.5 403.5 L 1416.5 403.5 L 1416.5 440.5 L 1391.5 440.5 Z M 506.5 403.5 L 532.5 403.5 L 532.5 440.5 L 506.5 440.5 Z M 796.5 435.5 L 899.5 435.5 L 899.5 455.5 L 796.5 455.5 Z M 1391.5 440.5 L 1416.5 440.5 L 1416.5 465.5 L 1391.5 465.5 Z M 506.5 440.5 L 532.5 440.5 L 532.5 465.5 L 506.5 465.5 Z M 506.5 465.5 L 532.5 465.5 L 532.5 489.5 L 506.5 489.5 Z M 1391.5 465.5 L 1416.5 465.5 L 1416.5 489.5 L 1391.5 489.5 Z M 1391.5 465.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 506.5 181.5 L 532.5 181.5 L 532.5 216.5 L 506.5 216.5 Z M 1391.5 181.5 L 1416.5 181.5 L 1416.5 216.5 L 1391.5 216.5 Z M 1391.5 216.5 L 1416.5 216.5 L 1416.5 241.5 L 1391.5 241.5 Z M 506.5 216.5 L 532.5 216.5 L 532.5 241.5 L 506.5 241.5 Z M 506.5 241.5 L 532.5 241.5 L 532.5 259.5 L 506.5 259.5 Z M 1391.5 241.5 L 1416.5 241.5 L 1416.5 259.5 L 1391.5 259.5 Z M 506.5 814.5 L 532.5 814.5 L 532.5 832.5 L 506.5 832.5 Z M 506.5 832.5 L 532.5 832.5 L 532.5 857.5 L 506.5 857.5 Z M 506.5 857.5 L 532.5 857.5 L 532.5 891.5 L 506.5 891.5 Z M 506.5 857.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 921.5 169.5 L 944.5 169.5 L 944.5 265.5 L 921.5 265.5 Z M 1226.5 169.5 L 1248.5 169.5 L 1248.5 265.5 L 1226.5 265.5 Z M 1112.5 169.5 L 1134.5 169.5 L 1134.5 265.5 L 1112.5 265.5 Z M 1049.5 169.5 L 1071.5 169.5 L 1071.5 265.5 L 1049.5 265.5 Z M 985.5 169.5 L 1007.5 169.5 L 1007.5 265.5 L 985.5 265.5 Z M 838.5 816.5 L 860.5 816.5 L 860.5 878.5 L 838.5 878.5 Z M 1055.5 808.5 L 1077.5 808.5 L 1077.5 904.5 L 1055.5 904.5 Z M 1251.5 808.5 L 1273.5 808.5 L 1273.5 904.5 L 1251.5 904.5 Z M 1182.5 808.5 L 1204.5 808.5 L 1204.5 904.5 L 1182.5 904.5 Z M 1118.5 808.5 L 1140.5 808.5 L 1140.5 904.5 L 1118.5 904.5 Z M 1328.5 808.5 L 1350.5 808.5 L 1350.5 904.5 L 1328.5 904.5 Z M 991.5 808.5 L 1013.5 808.5 L 1013.5 904.5 L 991.5 904.5 Z M 991.5 808.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image391"/>
 </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 1181.5 365.5 L 1203.5 365.5 L 1203.5 482.5 L 1181.5 482.5 Z M 1248.5 365.5 L 1271.5 365.5 L 1271.5 482.5 L 1248.5 482.5 Z M 1181.5 591.5 L 1203.5 591.5 L 1203.5 708.5 L 1181.5 708.5 Z M 1328.5 571.5 L 1350.5 571.5 L 1350.5 719.5 L 1328.5 719.5 Z M 1251.5 571.5 L 1273.5 571.5 L 1273.5 719.5 L 1251.5 719.5 Z M 836.5 571.5 L 859.5 571.5 L 859.5 719.5 L 836.5 719.5 Z M 836.5 571.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 506.5 121.5 L 532.5 121.5 L 532.5 147.5 L 506.5 147.5 Z M 1391.5 121.5 L 1416.5 121.5 L 1416.5 147.5 L 1391.5 147.5 Z M 1323.5 121.5 L 1348.5 121.5 L 1348.5 147.5 L 1323.5 147.5 Z M 1255.5 121.5 L 1280.5 121.5 L 1280.5 147.5 L 1255.5 147.5 Z M 1187.5 121.5 L 1212.5 121.5 L 1212.5 147.5 L 1187.5 147.5 Z M 1119.5 121.5 L 1144.5 121.5 L 1144.5 147.5 L 1119.5 147.5 Z M 1051.5 121.5 L 1076.5 121.5 L 1076.5 147.5 L 1051.5 147.5 Z M 983.5 121.5 L 1008.5 121.5 L 1008.5 147.5 L 983.5 147.5 Z M 915.5 121.5 L 940.5 121.5 L 940.5 147.5 L 915.5 147.5 Z M 847.5 121.5 L 872.5 121.5 L 872.5 147.5 L 847.5 147.5 Z M 779.5 121.5 L 804.5 121.5 L 804.5 147.5 L 779.5 147.5 Z M 711.5 121.5 L 736.5 121.5 L 736.5 147.5 L 711.5 147.5 Z M 643.5 121.5 L 668.5 121.5 L 668.5 147.5 L 643.5 147.5 Z M 574.5 121.5 L 600.5 121.5 L 600.5 147.5 L 574.5 147.5 Z M 506.5 398.5 L 531.5 398.5 L 531.5 403.5 L 506.5 403.5 Z M 1383.5 398.5 L 1408.5 398.5 L 1408.5 403.5 L 1383.5 403.5 Z M 506.5 403.5 L 531.5 403.5 L 531.5 423.5 L 506.5 423.5 Z M 1383.5 403.5 L 1408.5 403.5 L 1408.5 423.5 L 1383.5 423.5 Z M 711.5 524.5 L 736.5 524.5 L 736.5 549.5 L 711.5 549.5 Z M 574.5 524.5 L 600.5 524.5 L 600.5 549.5 L 574.5 549.5 Z M 506.5 524.5 L 532.5 524.5 L 532.5 549.5 L 506.5 549.5 Z M 1255.5 524.5 L 1280.5 524.5 L 1280.5 549.5 L 1255.5 549.5 Z M 643.5 524.5 L 668.5 524.5 L 668.5 549.5 L 643.5 549.5 Z M 1391.5 524.5 L 1416.5 524.5 L 1416.5 549.5 L 1391.5 549.5 Z M 1323.5 524.5 L 1348.5 524.5 L 1348.5 549.5 L 1323.5 549.5 Z M 802.5 601.5 L 827.5 601.5 L 827.5 625.5 L 802.5 625.5 Z M 802.5 625.5 L 827.5 625.5 L 827.5 626.5 L 802.5 626.5 Z M 695.5 601.5 L 720.5 601.5 L 720.5 626.5 L 695.5 626.5 Z M 748.5 601.5 L 773.5 601.5 L 773.5 626.5 L 748.5 626.5 Z M 506.5 926.5 L 532.5 926.5 L 532.5 951.5 L 506.5 951.5 Z M 1391.5 926.5 L 1416.5 926.5 L 1416.5 951.5 L 1391.5 951.5 Z M 1323.5 926.5 L 1348.5 926.5 L 1348.5 951.5 L 1323.5 951.5 Z M 1255.5 926.5 L 1280.5 926.5 L 1280.5 951.5 L 1255.5 951.5 Z M 1187.5 926.5 L 1212.5 926.5 L 1212.5 951.5 L 1187.5 951.5 Z M 1119.5 926.5 L 1144.5 926.5 L 1144.5 951.5 L 1119.5 951.5 Z M 1051.5 926.5 L 1076.5 926.5 L 1076.5 951.5 L 1051.5 951.5 Z M 983.5 926.5 L 1008.5 926.5 L 1008.5 951.5 L 983.5 951.5 Z M 915.5 926.5 L 940.5 926.5 L 940.5 951.5 L 915.5 951.5 Z M 847.5 926.5 L 872.5 926.5 L 872.5 951.5 L 847.5 951.5 Z M 779.5 926.5 L 804.5 926.5 L 804.5 951.5 L 779.5 951.5 Z M 711.5 926.5 L 736.5 926.5 L 736.5 951.5 L 711.5 951.5 Z M 643.5 926.5 L 668.5 926.5 L 668.5 951.5 L 643.5 951.5 Z M 574.5 926.5 L 600.5 926.5 L 600.5 951.5 L 574.5 951.5 Z M 574.5 926.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" 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="#image363"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface356">
+<g id="surface386">
 <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 1305.5 782.238281 L 1316.71875 798.5 L 1311.71875 798.5 L 1303.066406 785.28125 L 1294.371094 798.5 L 1289.457031 798.5 L 1300.675781 782.238281 L 1290.152344 766.804688 L 1295.066406 766.804688 L 1303.195312 779.238281 L 1311.371094 766.804688 L 1316.195312 766.804688 Z M 1305.5 782.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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1289 284 L 1289 309 M 1314 284 L 1314 309 " 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 1289 309 L 1314 309 M 1289 284 L 1314 284 M 1314 309 L 1314 284 M 1289 309 L 1289 284 " 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 485 135 L 485 144 M 480 140 L 489 140 M 484 141 L 486 141 M 484 139 L 486 139 M 484 139 L 484 141 M 486 139 L 486 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.svg b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.svg
index 9d46228..2ea7545 100644
--- a/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.svg
+++ b/cells/lpflow_lsbuf_lh_isowell_tap/sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 1056.5 327.5 L 1523.5 327.5 L 1523.5 746.5 L 1056.5 746.5 Z M 399.5 327.5 L 523.5 327.5 L 523.5 746.5 L 399.5 746.5 Z M 711.5 327.5 L 868.5 327.5 L 868.5 746.5 L 711.5 746.5 Z M 711.5 327.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 449.5 360.5 L 474.5 360.5 L 474.5 377.5 L 449.5 377.5 Z M 1469.5 360.5 L 1495.5 360.5 L 1495.5 377.5 L 1469.5 377.5 Z M 1469.5 377.5 L 1495.5 377.5 L 1495.5 403.5 L 1469.5 403.5 Z M 449.5 377.5 L 474.5 377.5 L 474.5 403.5 L 449.5 403.5 Z M 738.5 389.5 L 841.5 389.5 L 841.5 410.5 L 738.5 410.5 Z M 738.5 410.5 L 841.5 410.5 L 841.5 435.5 L 738.5 435.5 Z M 1469.5 403.5 L 1495.5 403.5 L 1495.5 440.5 L 1469.5 440.5 Z M 449.5 403.5 L 474.5 403.5 L 474.5 440.5 L 449.5 440.5 Z M 738.5 435.5 L 841.5 435.5 L 841.5 455.5 L 738.5 455.5 Z M 1469.5 440.5 L 1495.5 440.5 L 1495.5 465.5 L 1469.5 465.5 Z M 449.5 440.5 L 474.5 440.5 L 474.5 465.5 L 449.5 465.5 Z M 449.5 465.5 L 474.5 465.5 L 474.5 489.5 L 449.5 489.5 Z M 1469.5 465.5 L 1495.5 465.5 L 1495.5 489.5 L 1469.5 489.5 Z M 1469.5 465.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 449.5 181.5 L 474.5 181.5 L 474.5 216.5 L 449.5 216.5 Z M 1469.5 181.5 L 1495.5 181.5 L 1495.5 216.5 L 1469.5 216.5 Z M 1469.5 216.5 L 1495.5 216.5 L 1495.5 241.5 L 1469.5 241.5 Z M 449.5 216.5 L 474.5 216.5 L 474.5 241.5 L 449.5 241.5 Z M 449.5 241.5 L 474.5 241.5 L 474.5 259.5 L 449.5 259.5 Z M 1469.5 241.5 L 1495.5 241.5 L 1495.5 259.5 L 1469.5 259.5 Z M 449.5 814.5 L 474.5 814.5 L 474.5 832.5 L 449.5 832.5 Z M 449.5 832.5 L 474.5 832.5 L 474.5 857.5 L 449.5 857.5 Z M 449.5 857.5 L 474.5 857.5 L 474.5 891.5 L 449.5 891.5 Z M 449.5 857.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 864.5 169.5 L 886.5 169.5 L 886.5 265.5 L 864.5 265.5 Z M 1168.5 169.5 L 1191.5 169.5 L 1191.5 265.5 L 1168.5 265.5 Z M 1055.5 169.5 L 1077.5 169.5 L 1077.5 265.5 L 1055.5 265.5 Z M 991.5 169.5 L 1013.5 169.5 L 1013.5 265.5 L 991.5 265.5 Z M 927.5 169.5 L 949.5 169.5 L 949.5 265.5 L 927.5 265.5 Z M 780.5 816.5 L 802.5 816.5 L 802.5 878.5 L 780.5 878.5 Z M 1060.5 808.5 L 1083.5 808.5 L 1083.5 904.5 L 1060.5 904.5 Z M 1334.5 808.5 L 1356.5 808.5 L 1356.5 904.5 L 1334.5 904.5 Z M 1271.5 808.5 L 1293.5 808.5 L 1293.5 904.5 L 1271.5 904.5 Z M 1194.5 808.5 L 1216.5 808.5 L 1216.5 904.5 L 1194.5 904.5 Z M 1124.5 808.5 L 1146.5 808.5 L 1146.5 904.5 L 1124.5 904.5 Z M 933.5 808.5 L 955.5 808.5 L 955.5 904.5 L 933.5 904.5 Z M 997.5 808.5 L 1019.5 808.5 L 1019.5 904.5 L 997.5 904.5 Z M 1398.5 808.5 L 1420.5 808.5 L 1420.5 904.5 L 1398.5 904.5 Z M 1398.5 808.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image391"/>
 </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 1123.5 365.5 L 1146.5 365.5 L 1146.5 482.5 L 1123.5 482.5 Z M 1191.5 365.5 L 1213.5 365.5 L 1213.5 482.5 L 1191.5 482.5 Z M 1123.5 591.5 L 1146.5 591.5 L 1146.5 708.5 L 1123.5 708.5 Z M 1194.5 571.5 L 1216.5 571.5 L 1216.5 719.5 L 1194.5 719.5 Z M 1334.5 571.5 L 1356.5 571.5 L 1356.5 719.5 L 1334.5 719.5 Z M 1271.5 571.5 L 1293.5 571.5 L 1293.5 719.5 L 1271.5 719.5 Z M 779.5 571.5 L 801.5 571.5 L 801.5 719.5 L 779.5 719.5 Z M 1398.5 571.5 L 1420.5 571.5 L 1420.5 719.5 L 1398.5 719.5 Z M 1398.5 571.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 449.5 121.5 L 474.5 121.5 L 474.5 147.5 L 449.5 147.5 Z M 1469.5 121.5 L 1495.5 121.5 L 1495.5 147.5 L 1469.5 147.5 Z M 1401.5 121.5 L 1427.5 121.5 L 1427.5 147.5 L 1401.5 147.5 Z M 1333.5 121.5 L 1359.5 121.5 L 1359.5 147.5 L 1333.5 147.5 Z M 1265.5 121.5 L 1290.5 121.5 L 1290.5 147.5 L 1265.5 147.5 Z M 1197.5 121.5 L 1222.5 121.5 L 1222.5 147.5 L 1197.5 147.5 Z M 1129.5 121.5 L 1154.5 121.5 L 1154.5 147.5 L 1129.5 147.5 Z M 1061.5 121.5 L 1086.5 121.5 L 1086.5 147.5 L 1061.5 147.5 Z M 993.5 121.5 L 1018.5 121.5 L 1018.5 147.5 L 993.5 147.5 Z M 925.5 121.5 L 950.5 121.5 L 950.5 147.5 L 925.5 147.5 Z M 857.5 121.5 L 882.5 121.5 L 882.5 147.5 L 857.5 147.5 Z M 789.5 121.5 L 814.5 121.5 L 814.5 147.5 L 789.5 147.5 Z M 721.5 121.5 L 746.5 121.5 L 746.5 147.5 L 721.5 147.5 Z M 653.5 121.5 L 678.5 121.5 L 678.5 147.5 L 653.5 147.5 Z M 585.5 121.5 L 610.5 121.5 L 610.5 147.5 L 585.5 147.5 Z M 517.5 121.5 L 542.5 121.5 L 542.5 147.5 L 517.5 147.5 Z M 448.5 398.5 L 473.5 398.5 L 473.5 403.5 L 448.5 403.5 Z M 1461.5 398.5 L 1487.5 398.5 L 1487.5 403.5 L 1461.5 403.5 Z M 1461.5 403.5 L 1487.5 403.5 L 1487.5 423.5 L 1461.5 423.5 Z M 448.5 403.5 L 473.5 403.5 L 473.5 423.5 L 448.5 423.5 Z M 653.5 524.5 L 678.5 524.5 L 678.5 549.5 L 653.5 549.5 Z M 1265.5 524.5 L 1290.5 524.5 L 1290.5 549.5 L 1265.5 549.5 Z M 585.5 524.5 L 610.5 524.5 L 610.5 549.5 L 585.5 549.5 Z M 517.5 524.5 L 542.5 524.5 L 542.5 549.5 L 517.5 549.5 Z M 449.5 524.5 L 474.5 524.5 L 474.5 549.5 L 449.5 549.5 Z M 1197.5 524.5 L 1222.5 524.5 L 1222.5 549.5 L 1197.5 549.5 Z M 1401.5 524.5 L 1427.5 524.5 L 1427.5 549.5 L 1401.5 549.5 Z M 1333.5 524.5 L 1359.5 524.5 L 1359.5 549.5 L 1333.5 549.5 Z M 1469.5 524.5 L 1495.5 524.5 L 1495.5 549.5 L 1469.5 549.5 Z M 744.5 601.5 L 769.5 601.5 L 769.5 625.5 L 744.5 625.5 Z M 744.5 625.5 L 769.5 625.5 L 769.5 626.5 L 744.5 626.5 Z M 637.5 601.5 L 662.5 601.5 L 662.5 626.5 L 637.5 626.5 Z M 691.5 601.5 L 716.5 601.5 L 716.5 626.5 L 691.5 626.5 Z M 449.5 926.5 L 474.5 926.5 L 474.5 951.5 L 449.5 951.5 Z M 1469.5 926.5 L 1495.5 926.5 L 1495.5 951.5 L 1469.5 951.5 Z M 1401.5 926.5 L 1427.5 926.5 L 1427.5 951.5 L 1401.5 951.5 Z M 1333.5 926.5 L 1359.5 926.5 L 1359.5 951.5 L 1333.5 951.5 Z M 1265.5 926.5 L 1290.5 926.5 L 1290.5 951.5 L 1265.5 951.5 Z M 1197.5 926.5 L 1222.5 926.5 L 1222.5 951.5 L 1197.5 951.5 Z M 1129.5 926.5 L 1154.5 926.5 L 1154.5 951.5 L 1129.5 951.5 Z M 1061.5 926.5 L 1086.5 926.5 L 1086.5 951.5 L 1061.5 951.5 Z M 993.5 926.5 L 1018.5 926.5 L 1018.5 951.5 L 993.5 951.5 Z M 925.5 926.5 L 950.5 926.5 L 950.5 951.5 L 925.5 951.5 Z M 857.5 926.5 L 882.5 926.5 L 882.5 951.5 L 857.5 951.5 Z M 789.5 926.5 L 814.5 926.5 L 814.5 951.5 L 789.5 951.5 Z M 721.5 926.5 L 746.5 926.5 L 746.5 951.5 L 721.5 951.5 Z M 653.5 926.5 L 678.5 926.5 L 678.5 951.5 L 653.5 951.5 Z M 585.5 926.5 L 610.5 926.5 L 610.5 951.5 L 585.5 951.5 Z M 517.5 926.5 L 542.5 926.5 L 542.5 951.5 L 517.5 951.5 Z M 517.5 926.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" 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="#image363"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface356">
+<g id="surface386">
 <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 1247.5 782.238281 L 1258.71875 798.5 L 1253.71875 798.5 L 1245.066406 785.28125 L 1236.371094 798.5 L 1231.457031 798.5 L 1242.675781 782.238281 L 1232.152344 766.804688 L 1237.066406 766.804688 L 1245.195312 779.238281 L 1253.371094 766.804688 L 1258.195312 766.804688 Z M 1247.5 782.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 1231 309 L 1256 309 M 1231 284 L 1256 284 M 1231 284 L 1231 309 M 1256 284 L 1256 309 " 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 1231 309 L 1256 309 M 1231 284 L 1256 284 M 1256 309 L 1256 284 M 1231 309 L 1231 284 " 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 427 135 L 427 144 M 422 140 L 431 140 M 426 141 L 428 141 M 426 139 L 428 139 M 426 139 L 426 141 M 428 139 L 428 141 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.svg b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.svg
index 2eb8c89..41a73a7 100644
--- a/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.svg
+++ b/cells/macro_sparecell/sky130_fd_sc_hd__macro_sparecell.svg
@@ -1,183 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1898pt" height="1059pt" viewBox="0 0 1898 1059" version="1.2">
 <defs>
-<g>
-<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d="M 0.890625 3.1875 L 0.890625 -12.6875 L 9.890625 -12.6875 L 9.890625 3.1875 Z M 1.90625 2.1875 L 8.890625 2.1875 L 8.890625 -11.6875 L 1.90625 -11.6875 Z M 1.90625 2.1875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 7.96875 -9.546875 L 7.96875 -8.03125 C 7.507812 -8.257812 7.035156 -8.429688 6.546875 -8.546875 C 6.054688 -8.671875 5.546875 -8.734375 5.015625 -8.734375 C 4.210938 -8.734375 3.609375 -8.609375 3.203125 -8.359375 C 2.804688 -8.109375 2.609375 -7.738281 2.609375 -7.25 C 2.609375 -6.875 2.75 -6.578125 3.03125 -6.359375 C 3.320312 -6.148438 3.898438 -5.945312 4.765625 -5.75 L 5.328125 -5.640625 C 6.472656 -5.390625 7.285156 -5.039062 7.765625 -4.59375 C 8.253906 -4.144531 8.5 -3.519531 8.5 -2.71875 C 8.5 -1.800781 8.132812 -1.078125 7.40625 -0.546875 C 6.6875 -0.015625 5.695312 0.25 4.4375 0.25 C 3.90625 0.25 3.351562 0.195312 2.78125 0.09375 C 2.207031 0 1.601562 -0.148438 0.96875 -0.359375 L 0.96875 -2.03125 C 1.570312 -1.71875 2.160156 -1.484375 2.734375 -1.328125 C 3.316406 -1.171875 3.894531 -1.09375 4.46875 -1.09375 C 5.226562 -1.09375 5.8125 -1.222656 6.21875 -1.484375 C 6.632812 -1.742188 6.84375 -2.113281 6.84375 -2.59375 C 6.84375 -3.03125 6.691406 -3.363281 6.390625 -3.59375 C 6.097656 -3.832031 5.453125 -4.0625 4.453125 -4.28125 L 3.890625 -4.40625 C 2.878906 -4.625 2.148438 -4.945312 1.703125 -5.375 C 1.265625 -5.8125 1.046875 -6.414062 1.046875 -7.1875 C 1.046875 -8.101562 1.375 -8.8125 2.03125 -9.3125 C 2.6875 -9.820312 3.617188 -10.078125 4.828125 -10.078125 C 5.421875 -10.078125 5.976562 -10.03125 6.5 -9.9375 C 7.03125 -9.851562 7.519531 -9.722656 7.96875 -9.546875 Z M 7.96875 -9.546875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 1.640625 -13.671875 L 3.265625 -13.671875 L 3.265625 -5.59375 L 8.09375 -9.84375 L 10.15625 -9.84375 L 4.9375 -5.234375 L 10.375 0 L 8.265625 0 L 3.265625 -4.8125 L 3.265625 0 L 1.640625 0 Z M 1.640625 -13.671875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 5.796875 0.921875 C 5.335938 2.085938 4.890625 2.847656 4.453125 3.203125 C 4.023438 3.566406 3.445312 3.75 2.71875 3.75 L 1.421875 3.75 L 1.421875 2.390625 L 2.375 2.390625 C 2.820312 2.390625 3.164062 2.285156 3.40625 2.078125 C 3.65625 1.867188 3.929688 1.367188 4.234375 0.578125 L 4.515625 -0.15625 L 0.53125 -9.84375 L 2.25 -9.84375 L 5.328125 -2.140625 L 8.40625 -9.84375 L 10.109375 -9.84375 Z M 5.796875 0.921875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-4">
-<path style="stroke:none;" d="M 2.234375 -1.5 L 5.140625 -1.5 L 5.140625 -11.5 L 1.984375 -10.875 L 1.984375 -12.484375 L 5.109375 -13.125 L 6.890625 -13.125 L 6.890625 -1.5 L 9.796875 -1.5 L 9.796875 0 L 2.234375 0 Z M 2.234375 -1.5 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-5">
-<path style="stroke:none;" d="M 7.296875 -7.078125 C 8.148438 -6.890625 8.816406 -6.507812 9.296875 -5.9375 C 9.773438 -5.363281 10.015625 -4.65625 10.015625 -3.8125 C 10.015625 -2.519531 9.566406 -1.519531 8.671875 -0.8125 C 7.785156 -0.101562 6.519531 0.25 4.875 0.25 C 4.320312 0.25 3.753906 0.191406 3.171875 0.078125 C 2.585938 -0.0234375 1.988281 -0.179688 1.375 -0.390625 L 1.375 -2.109375 C 1.863281 -1.816406 2.398438 -1.597656 2.984375 -1.453125 C 3.578125 -1.304688 4.191406 -1.234375 4.828125 -1.234375 C 5.941406 -1.234375 6.789062 -1.453125 7.375 -1.890625 C 7.957031 -2.335938 8.25 -2.976562 8.25 -3.8125 C 8.25 -4.582031 7.976562 -5.1875 7.4375 -5.625 C 6.894531 -6.0625 6.140625 -6.28125 5.171875 -6.28125 L 3.640625 -6.28125 L 3.640625 -7.75 L 5.234375 -7.75 C 6.109375 -7.75 6.773438 -7.921875 7.234375 -8.265625 C 7.703125 -8.617188 7.9375 -9.125 7.9375 -9.78125 C 7.9375 -10.445312 7.695312 -10.957031 7.21875 -11.3125 C 6.738281 -11.675781 6.054688 -11.859375 5.171875 -11.859375 C 4.679688 -11.859375 4.15625 -11.804688 3.59375 -11.703125 C 3.039062 -11.597656 2.429688 -11.4375 1.765625 -11.21875 L 1.765625 -12.796875 C 2.441406 -12.984375 3.070312 -13.125 3.65625 -13.21875 C 4.25 -13.3125 4.804688 -13.359375 5.328125 -13.359375 C 6.671875 -13.359375 7.734375 -13.050781 8.515625 -12.4375 C 9.304688 -11.820312 9.703125 -10.992188 9.703125 -9.953125 C 9.703125 -9.234375 9.492188 -8.617188 9.078125 -8.109375 C 8.660156 -7.609375 8.066406 -7.265625 7.296875 -7.078125 Z M 7.296875 -7.078125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-6">
-<path style="stroke:none;" d="M 5.71875 -11.953125 C 4.800781 -11.953125 4.113281 -11.5 3.65625 -10.59375 C 3.195312 -9.695312 2.96875 -8.347656 2.96875 -6.546875 C 2.96875 -4.742188 3.195312 -3.394531 3.65625 -2.5 C 4.113281 -1.601562 4.800781 -1.15625 5.71875 -1.15625 C 6.644531 -1.15625 7.335938 -1.601562 7.796875 -2.5 C 8.253906 -3.394531 8.484375 -4.742188 8.484375 -6.546875 C 8.484375 -8.347656 8.253906 -9.695312 7.796875 -10.59375 C 7.335938 -11.5 6.644531 -11.953125 5.71875 -11.953125 Z M 5.71875 -13.359375 C 7.1875 -13.359375 8.304688 -12.773438 9.078125 -11.609375 C 9.859375 -10.453125 10.25 -8.765625 10.25 -6.546875 C 10.25 -4.335938 9.859375 -2.648438 9.078125 -1.484375 C 8.304688 -0.328125 7.1875 0.25 5.71875 0.25 C 4.25 0.25 3.125 -0.328125 2.34375 -1.484375 C 1.570312 -2.648438 1.1875 -4.335938 1.1875 -6.546875 C 1.1875 -8.765625 1.570312 -10.453125 2.34375 -11.609375 C 3.125 -12.773438 4.25 -13.359375 5.71875 -13.359375 Z M 5.71875 -13.359375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-7">
-<path style="stroke:none;" d="M 9.171875 2.984375 L 9.171875 4.25 L -0.171875 4.25 L -0.171875 2.984375 Z M 9.171875 2.984375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-8">
-<path style="stroke:none;" d="M 6.6875 -13.671875 L 6.6875 -12.328125 L 5.140625 -12.328125 C 4.554688 -12.328125 4.148438 -12.207031 3.921875 -11.96875 C 3.703125 -11.738281 3.59375 -11.320312 3.59375 -10.71875 L 3.59375 -9.84375 L 6.25 -9.84375 L 6.25 -8.59375 L 3.59375 -8.59375 L 3.59375 0 L 1.953125 0 L 1.953125 -8.59375 L 0.40625 -8.59375 L 0.40625 -9.84375 L 1.953125 -9.84375 L 1.953125 -10.53125 C 1.953125 -11.625 2.207031 -12.421875 2.71875 -12.921875 C 3.226562 -13.421875 4.039062 -13.671875 5.15625 -13.671875 Z M 6.6875 -13.671875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-9">
-<path style="stroke:none;" d="M 8.171875 -8.34375 L 8.171875 -13.671875 L 9.796875 -13.671875 L 9.796875 0 L 8.171875 0 L 8.171875 -1.484375 C 7.835938 -0.890625 7.410156 -0.453125 6.890625 -0.171875 C 6.367188 0.109375 5.742188 0.25 5.015625 0.25 C 3.828125 0.25 2.859375 -0.222656 2.109375 -1.171875 C 1.367188 -2.117188 1 -3.363281 1 -4.90625 C 1 -6.457031 1.367188 -7.707031 2.109375 -8.65625 C 2.859375 -9.601562 3.828125 -10.078125 5.015625 -10.078125 C 5.742188 -10.078125 6.367188 -9.9375 6.890625 -9.65625 C 7.410156 -9.375 7.835938 -8.9375 8.171875 -8.34375 Z M 2.65625 -4.90625 C 2.65625 -3.71875 2.898438 -2.785156 3.390625 -2.109375 C 3.878906 -1.429688 4.554688 -1.09375 5.421875 -1.09375 C 6.273438 -1.09375 6.945312 -1.429688 7.4375 -2.109375 C 7.925781 -2.785156 8.171875 -3.71875 8.171875 -4.90625 C 8.171875 -6.101562 7.925781 -7.039062 7.4375 -7.71875 C 6.945312 -8.394531 6.273438 -8.734375 5.421875 -8.734375 C 4.554688 -8.734375 3.878906 -8.394531 3.390625 -7.71875 C 2.898438 -7.039062 2.65625 -6.101562 2.65625 -4.90625 Z M 2.65625 -4.90625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-10">
-<path style="stroke:none;" d="M 8.78125 -9.46875 L 8.78125 -7.953125 C 8.320312 -8.203125 7.863281 -8.390625 7.40625 -8.515625 C 6.945312 -8.640625 6.484375 -8.703125 6.015625 -8.703125 C 4.960938 -8.703125 4.144531 -8.367188 3.5625 -7.703125 C 2.988281 -7.046875 2.703125 -6.113281 2.703125 -4.90625 C 2.703125 -3.707031 2.988281 -2.773438 3.5625 -2.109375 C 4.144531 -1.441406 4.960938 -1.109375 6.015625 -1.109375 C 6.484375 -1.109375 6.945312 -1.171875 7.40625 -1.296875 C 7.863281 -1.429688 8.320312 -1.625 8.78125 -1.875 L 8.78125 -0.375 C 8.332031 -0.164062 7.863281 -0.0078125 7.375 0.09375 C 6.894531 0.195312 6.382812 0.25 5.84375 0.25 C 4.351562 0.25 3.171875 -0.210938 2.296875 -1.140625 C 1.429688 -2.078125 1 -3.332031 1 -4.90625 C 1 -6.519531 1.4375 -7.785156 2.3125 -8.703125 C 3.195312 -9.617188 4.40625 -10.078125 5.9375 -10.078125 C 6.4375 -10.078125 6.921875 -10.023438 7.390625 -9.921875 C 7.867188 -9.828125 8.332031 -9.675781 8.78125 -9.46875 Z M 8.78125 -9.46875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-11">
-<path style="stroke:none;" d="M 9.875 -5.9375 L 9.875 0 L 8.265625 0 L 8.265625 -5.890625 C 8.265625 -6.816406 8.082031 -7.507812 7.71875 -7.96875 C 7.351562 -8.4375 6.804688 -8.671875 6.078125 -8.671875 C 5.203125 -8.671875 4.515625 -8.390625 4.015625 -7.828125 C 3.515625 -7.273438 3.265625 -6.519531 3.265625 -5.5625 L 3.265625 0 L 1.640625 0 L 1.640625 -13.671875 L 3.265625 -13.671875 L 3.265625 -8.3125 C 3.648438 -8.90625 4.101562 -9.347656 4.625 -9.640625 C 5.15625 -9.929688 5.757812 -10.078125 6.4375 -10.078125 C 7.570312 -10.078125 8.425781 -9.726562 9 -9.03125 C 9.582031 -8.332031 9.875 -7.300781 9.875 -5.9375 Z M 9.875 -5.9375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-12">
-<path style="stroke:none;" d="M 1.703125 -9.84375 L 3.3125 -9.84375 L 3.3125 0 L 1.703125 0 Z M 1.703125 -13.671875 L 3.3125 -13.671875 L 3.3125 -11.625 L 1.703125 -11.625 Z M 1.703125 -13.671875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-13">
-<path style="stroke:none;" d="M 9.875 -5.9375 L 9.875 0 L 8.265625 0 L 8.265625 -5.890625 C 8.265625 -6.816406 8.082031 -7.507812 7.71875 -7.96875 C 7.351562 -8.4375 6.804688 -8.671875 6.078125 -8.671875 C 5.203125 -8.671875 4.515625 -8.390625 4.015625 -7.828125 C 3.515625 -7.273438 3.265625 -6.519531 3.265625 -5.5625 L 3.265625 0 L 1.640625 0 L 1.640625 -9.84375 L 3.265625 -9.84375 L 3.265625 -8.3125 C 3.648438 -8.90625 4.101562 -9.347656 4.625 -9.640625 C 5.15625 -9.929688 5.757812 -10.078125 6.4375 -10.078125 C 7.570312 -10.078125 8.425781 -9.726562 9 -9.03125 C 9.582031 -8.332031 9.875 -7.300781 9.875 -5.9375 Z M 9.875 -5.9375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-14">
-<path style="stroke:none;" d="M 0.53125 -9.84375 L 2.25 -9.84375 L 5.328125 -1.578125 L 8.40625 -9.84375 L 10.109375 -9.84375 L 6.421875 0 L 4.234375 0 Z M 0.53125 -9.84375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-15">
-<path style="stroke:none;" d="M 3.453125 -1.5 L 9.65625 -1.5 L 9.65625 0 L 1.3125 0 L 1.3125 -1.5 C 1.988281 -2.195312 2.90625 -3.128906 4.0625 -4.296875 C 5.226562 -5.472656 5.960938 -6.234375 6.265625 -6.578125 C 6.835938 -7.210938 7.234375 -7.75 7.453125 -8.1875 C 7.679688 -8.632812 7.796875 -9.070312 7.796875 -9.5 C 7.796875 -10.195312 7.550781 -10.765625 7.0625 -11.203125 C 6.570312 -11.640625 5.9375 -11.859375 5.15625 -11.859375 C 4.59375 -11.859375 4.003906 -11.757812 3.390625 -11.5625 C 2.773438 -11.375 2.113281 -11.085938 1.40625 -10.703125 L 1.40625 -12.484375 C 2.125 -12.773438 2.789062 -12.992188 3.40625 -13.140625 C 4.03125 -13.285156 4.597656 -13.359375 5.109375 -13.359375 C 6.472656 -13.359375 7.554688 -13.019531 8.359375 -12.34375 C 9.171875 -11.664062 9.578125 -10.753906 9.578125 -9.609375 C 9.578125 -9.078125 9.472656 -8.566406 9.265625 -8.078125 C 9.066406 -7.597656 8.703125 -7.03125 8.171875 -6.375 C 8.023438 -6.207031 7.554688 -5.71875 6.765625 -4.90625 C 5.984375 -4.09375 4.878906 -2.957031 3.453125 -1.5 Z M 3.453125 -1.5 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-16">
-<path style="stroke:none;" d="M 5.515625 -8.703125 C 4.640625 -8.703125 3.953125 -8.363281 3.453125 -7.6875 C 2.953125 -7.019531 2.703125 -6.09375 2.703125 -4.90625 C 2.703125 -3.726562 2.953125 -2.800781 3.453125 -2.125 C 3.953125 -1.445312 4.640625 -1.109375 5.515625 -1.109375 C 6.367188 -1.109375 7.046875 -1.445312 7.546875 -2.125 C 8.054688 -2.8125 8.3125 -3.738281 8.3125 -4.90625 C 8.3125 -6.070312 8.054688 -6.992188 7.546875 -7.671875 C 7.046875 -8.359375 6.367188 -8.703125 5.515625 -8.703125 Z M 5.515625 -10.078125 C 6.921875 -10.078125 8.023438 -9.617188 8.828125 -8.703125 C 9.628906 -7.796875 10.03125 -6.53125 10.03125 -4.90625 C 10.03125 -3.300781 9.628906 -2.039062 8.828125 -1.125 C 8.023438 -0.207031 6.921875 0.25 5.515625 0.25 C 4.097656 0.25 2.988281 -0.207031 2.1875 -1.125 C 1.394531 -2.039062 1 -3.300781 1 -4.90625 C 1 -6.53125 1.394531 -7.796875 2.1875 -8.703125 C 2.988281 -9.617188 4.097656 -10.078125 5.515625 -10.078125 Z M 5.515625 -10.078125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-17">
-<path style="stroke:none;" d="M 7.40625 -8.328125 C 7.21875 -8.429688 7.015625 -8.507812 6.796875 -8.5625 C 6.585938 -8.613281 6.351562 -8.640625 6.09375 -8.640625 C 5.1875 -8.640625 4.488281 -8.34375 4 -7.75 C 3.507812 -7.15625 3.265625 -6.300781 3.265625 -5.1875 L 3.265625 0 L 1.640625 0 L 1.640625 -9.84375 L 3.265625 -9.84375 L 3.265625 -8.3125 C 3.597656 -8.914062 4.035156 -9.359375 4.578125 -9.640625 C 5.128906 -9.929688 5.796875 -10.078125 6.578125 -10.078125 C 6.679688 -10.078125 6.800781 -10.066406 6.9375 -10.046875 C 7.070312 -10.035156 7.222656 -10.019531 7.390625 -10 Z M 7.40625 -8.328125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-18">
-<path style="stroke:none;" d="M 6.171875 -4.953125 C 4.859375 -4.953125 3.953125 -4.800781 3.453125 -4.5 C 2.953125 -4.195312 2.703125 -3.6875 2.703125 -2.96875 C 2.703125 -2.394531 2.890625 -1.9375 3.265625 -1.59375 C 3.640625 -1.257812 4.15625 -1.09375 4.8125 -1.09375 C 5.707031 -1.09375 6.425781 -1.410156 6.96875 -2.046875 C 7.507812 -2.679688 7.78125 -3.53125 7.78125 -4.59375 L 7.78125 -4.953125 Z M 9.390625 -5.609375 L 9.390625 0 L 7.78125 0 L 7.78125 -1.5 C 7.40625 -0.894531 6.941406 -0.453125 6.390625 -0.171875 C 5.847656 0.109375 5.175781 0.25 4.375 0.25 C 3.363281 0.25 2.5625 -0.03125 1.96875 -0.59375 C 1.375 -1.15625 1.078125 -1.910156 1.078125 -2.859375 C 1.078125 -3.972656 1.445312 -4.8125 2.1875 -5.375 C 2.9375 -5.9375 4.046875 -6.21875 5.515625 -6.21875 L 7.78125 -6.21875 L 7.78125 -6.375 C 7.78125 -7.113281 7.535156 -7.6875 7.046875 -8.09375 C 6.554688 -8.5 5.867188 -8.703125 4.984375 -8.703125 C 4.421875 -8.703125 3.875 -8.632812 3.34375 -8.5 C 2.8125 -8.375 2.296875 -8.175781 1.796875 -7.90625 L 1.796875 -9.390625 C 2.390625 -9.617188 2.960938 -9.789062 3.515625 -9.90625 C 4.078125 -10.019531 4.625 -10.078125 5.15625 -10.078125 C 6.570312 -10.078125 7.628906 -9.707031 8.328125 -8.96875 C 9.035156 -8.226562 9.390625 -7.109375 9.390625 -5.609375 Z M 9.390625 -5.609375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph0-19">
-<path style="stroke:none;" d="M 8.765625 -4.90625 C 8.765625 -6.101562 8.519531 -7.039062 8.03125 -7.71875 C 7.539062 -8.394531 6.867188 -8.734375 6.015625 -8.734375 C 5.160156 -8.734375 4.488281 -8.394531 4 -7.71875 C 3.507812 -7.039062 3.265625 -6.101562 3.265625 -4.90625 C 3.265625 -3.71875 3.507812 -2.785156 4 -2.109375 C 4.488281 -1.429688 5.160156 -1.09375 6.015625 -1.09375 C 6.867188 -1.09375 7.539062 -1.429688 8.03125 -2.109375 C 8.519531 -2.785156 8.765625 -3.71875 8.765625 -4.90625 Z M 3.265625 -8.34375 C 3.597656 -8.9375 4.023438 -9.375 4.546875 -9.65625 C 5.066406 -9.9375 5.6875 -10.078125 6.40625 -10.078125 C 7.601562 -10.078125 8.570312 -9.601562 9.3125 -8.65625 C 10.0625 -7.707031 10.4375 -6.457031 10.4375 -4.90625 C 10.4375 -3.363281 10.0625 -2.117188 9.3125 -1.171875 C 8.570312 -0.222656 7.601562 0.25 6.40625 0.25 C 5.6875 0.25 5.066406 0.109375 4.546875 -0.171875 C 4.023438 -0.453125 3.597656 -0.890625 3.265625 -1.484375 L 3.265625 0 L 1.640625 0 L 1.640625 -13.671875 L 3.265625 -13.671875 Z M 3.265625 -8.34375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-0">
-<path style="stroke:none;" d="M 0.5 1.765625 L 0.5 -7.046875 L 5.5 -7.046875 L 5.5 1.765625 Z M 1.0625 1.21875 L 4.9375 1.21875 L 4.9375 -6.484375 L 1.0625 -6.484375 Z M 1.0625 1.21875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-1">
-<path style="stroke:none;" d="M 4.421875 -5.3125 L 4.421875 -4.453125 C 4.171875 -4.585938 3.910156 -4.6875 3.640625 -4.75 C 3.367188 -4.8125 3.082031 -4.84375 2.78125 -4.84375 C 2.34375 -4.84375 2.007812 -4.773438 1.78125 -4.640625 C 1.5625 -4.503906 1.453125 -4.300781 1.453125 -4.03125 C 1.453125 -3.820312 1.53125 -3.65625 1.6875 -3.53125 C 1.84375 -3.414062 2.164062 -3.304688 2.65625 -3.203125 L 2.953125 -3.125 C 3.597656 -2.988281 4.050781 -2.796875 4.3125 -2.546875 C 4.582031 -2.296875 4.71875 -1.953125 4.71875 -1.515625 C 4.71875 -1.003906 4.515625 -0.597656 4.109375 -0.296875 C 3.710938 -0.00390625 3.164062 0.140625 2.46875 0.140625 C 2.164062 0.140625 1.851562 0.109375 1.53125 0.046875 C 1.21875 -0.00390625 0.890625 -0.0859375 0.546875 -0.203125 L 0.546875 -1.125 C 0.878906 -0.957031 1.203125 -0.828125 1.515625 -0.734375 C 1.835938 -0.648438 2.160156 -0.609375 2.484375 -0.609375 C 2.898438 -0.609375 3.222656 -0.679688 3.453125 -0.828125 C 3.679688 -0.972656 3.796875 -1.175781 3.796875 -1.4375 C 3.796875 -1.6875 3.710938 -1.875 3.546875 -2 C 3.390625 -2.132812 3.03125 -2.257812 2.46875 -2.375 L 2.15625 -2.453125 C 1.601562 -2.566406 1.203125 -2.742188 0.953125 -2.984375 C 0.703125 -3.234375 0.578125 -3.566406 0.578125 -3.984375 C 0.578125 -4.503906 0.757812 -4.898438 1.125 -5.171875 C 1.488281 -5.453125 2.007812 -5.59375 2.6875 -5.59375 C 3.007812 -5.59375 3.316406 -5.566406 3.609375 -5.515625 C 3.910156 -5.472656 4.179688 -5.40625 4.421875 -5.3125 Z M 4.421875 -5.3125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-2">
-<path style="stroke:none;" d="M 0.90625 -7.59375 L 1.8125 -7.59375 L 1.8125 -3.109375 L 4.5 -5.46875 L 5.640625 -5.46875 L 2.734375 -2.90625 L 5.765625 0 L 4.59375 0 L 1.8125 -2.671875 L 1.8125 0 L 0.90625 0 Z M 0.90625 -7.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-3">
-<path style="stroke:none;" d="M 3.21875 0.515625 C 2.96875 1.160156 2.71875 1.582031 2.46875 1.78125 C 2.226562 1.976562 1.910156 2.078125 1.515625 2.078125 L 0.796875 2.078125 L 0.796875 1.328125 L 1.3125 1.328125 C 1.5625 1.328125 1.753906 1.269531 1.890625 1.15625 C 2.023438 1.039062 2.175781 0.765625 2.34375 0.328125 L 2.515625 -0.09375 L 0.296875 -5.46875 L 1.25 -5.46875 L 2.953125 -1.1875 L 4.671875 -5.46875 L 5.625 -5.46875 Z M 3.21875 0.515625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-4">
-<path style="stroke:none;" d="M 1.234375 -0.828125 L 2.859375 -0.828125 L 2.859375 -6.390625 L 1.09375 -6.046875 L 1.09375 -6.9375 L 2.84375 -7.296875 L 3.828125 -7.296875 L 3.828125 -0.828125 L 5.4375 -0.828125 L 5.4375 0 L 1.234375 0 Z M 1.234375 -0.828125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-5">
-<path style="stroke:none;" d="M 4.0625 -3.9375 C 4.53125 -3.832031 4.894531 -3.617188 5.15625 -3.296875 C 5.425781 -2.984375 5.5625 -2.59375 5.5625 -2.125 C 5.5625 -1.40625 5.3125 -0.847656 4.8125 -0.453125 C 4.320312 -0.0546875 3.617188 0.140625 2.703125 0.140625 C 2.398438 0.140625 2.085938 0.109375 1.765625 0.046875 C 1.441406 -0.015625 1.109375 -0.101562 0.765625 -0.21875 L 0.765625 -1.171875 C 1.035156 -1.015625 1.332031 -0.894531 1.65625 -0.8125 C 1.988281 -0.726562 2.332031 -0.6875 2.6875 -0.6875 C 3.300781 -0.6875 3.769531 -0.804688 4.09375 -1.046875 C 4.414062 -1.296875 4.578125 -1.65625 4.578125 -2.125 C 4.578125 -2.550781 4.425781 -2.882812 4.125 -3.125 C 3.820312 -3.363281 3.40625 -3.484375 2.875 -3.484375 L 2.015625 -3.484375 L 2.015625 -4.296875 L 2.90625 -4.296875 C 3.394531 -4.296875 3.765625 -4.394531 4.015625 -4.59375 C 4.273438 -4.789062 4.40625 -5.070312 4.40625 -5.4375 C 4.40625 -5.800781 4.269531 -6.082031 4 -6.28125 C 3.738281 -6.488281 3.363281 -6.59375 2.875 -6.59375 C 2.601562 -6.59375 2.3125 -6.5625 2 -6.5 C 1.6875 -6.445312 1.347656 -6.359375 0.984375 -6.234375 L 0.984375 -7.109375 C 1.359375 -7.210938 1.707031 -7.289062 2.03125 -7.34375 C 2.363281 -7.394531 2.671875 -7.421875 2.953125 -7.421875 C 3.703125 -7.421875 4.296875 -7.25 4.734375 -6.90625 C 5.171875 -6.570312 5.390625 -6.113281 5.390625 -5.53125 C 5.390625 -5.125 5.273438 -4.78125 5.046875 -4.5 C 4.816406 -4.226562 4.488281 -4.039062 4.0625 -3.9375 Z M 4.0625 -3.9375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-6">
-<path style="stroke:none;" d="M 3.171875 -6.640625 C 2.671875 -6.640625 2.289062 -6.390625 2.03125 -5.890625 C 1.78125 -5.390625 1.65625 -4.640625 1.65625 -3.640625 C 1.65625 -2.640625 1.78125 -1.890625 2.03125 -1.390625 C 2.289062 -0.890625 2.671875 -0.640625 3.171875 -0.640625 C 3.691406 -0.640625 4.078125 -0.890625 4.328125 -1.390625 C 4.585938 -1.890625 4.71875 -2.640625 4.71875 -3.640625 C 4.71875 -4.640625 4.585938 -5.390625 4.328125 -5.890625 C 4.078125 -6.390625 3.691406 -6.640625 3.171875 -6.640625 Z M 3.171875 -7.421875 C 3.992188 -7.421875 4.617188 -7.097656 5.046875 -6.453125 C 5.484375 -5.804688 5.703125 -4.867188 5.703125 -3.640625 C 5.703125 -2.410156 5.484375 -1.472656 5.046875 -0.828125 C 4.617188 -0.179688 3.992188 0.140625 3.171875 0.140625 C 2.359375 0.140625 1.734375 -0.179688 1.296875 -0.828125 C 0.867188 -1.472656 0.65625 -2.410156 0.65625 -3.640625 C 0.65625 -4.867188 0.867188 -5.804688 1.296875 -6.453125 C 1.734375 -7.097656 2.359375 -7.421875 3.171875 -7.421875 Z M 3.171875 -7.421875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-7">
-<path style="stroke:none;" d="M 5.09375 1.65625 L 5.09375 2.359375 L -0.09375 2.359375 L -0.09375 1.65625 Z M 5.09375 1.65625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-8">
-<path style="stroke:none;" d="M 3.71875 -7.59375 L 3.71875 -6.84375 L 2.859375 -6.84375 C 2.535156 -6.84375 2.3125 -6.773438 2.1875 -6.640625 C 2.0625 -6.515625 2 -6.285156 2 -5.953125 L 2 -5.46875 L 3.46875 -5.46875 L 3.46875 -4.765625 L 2 -4.765625 L 2 0 L 1.09375 0 L 1.09375 -4.765625 L 0.234375 -4.765625 L 0.234375 -5.46875 L 1.09375 -5.46875 L 1.09375 -5.84375 C 1.09375 -6.457031 1.234375 -6.898438 1.515625 -7.171875 C 1.796875 -7.453125 2.242188 -7.59375 2.859375 -7.59375 Z M 3.71875 -7.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-9">
-<path style="stroke:none;" d="M 4.546875 -4.640625 L 4.546875 -7.59375 L 5.4375 -7.59375 L 5.4375 0 L 4.546875 0 L 4.546875 -0.828125 C 4.359375 -0.492188 4.117188 -0.25 3.828125 -0.09375 C 3.535156 0.0625 3.1875 0.140625 2.78125 0.140625 C 2.125 0.140625 1.585938 -0.117188 1.171875 -0.640625 C 0.753906 -1.171875 0.546875 -1.867188 0.546875 -2.734375 C 0.546875 -3.585938 0.753906 -4.273438 1.171875 -4.796875 C 1.585938 -5.328125 2.125 -5.59375 2.78125 -5.59375 C 3.1875 -5.59375 3.535156 -5.515625 3.828125 -5.359375 C 4.117188 -5.203125 4.359375 -4.960938 4.546875 -4.640625 Z M 1.484375 -2.734375 C 1.484375 -2.066406 1.617188 -1.546875 1.890625 -1.171875 C 2.160156 -0.796875 2.535156 -0.609375 3.015625 -0.609375 C 3.484375 -0.609375 3.851562 -0.796875 4.125 -1.171875 C 4.40625 -1.546875 4.546875 -2.066406 4.546875 -2.734375 C 4.546875 -3.390625 4.40625 -3.90625 4.125 -4.28125 C 3.851562 -4.65625 3.484375 -4.84375 3.015625 -4.84375 C 2.535156 -4.84375 2.160156 -4.65625 1.890625 -4.28125 C 1.617188 -3.90625 1.484375 -3.390625 1.484375 -2.734375 Z M 1.484375 -2.734375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-10">
-<path style="stroke:none;" d="M 4.875 -5.265625 L 4.875 -4.421875 C 4.625 -4.554688 4.367188 -4.660156 4.109375 -4.734375 C 3.859375 -4.804688 3.601562 -4.84375 3.34375 -4.84375 C 2.757812 -4.84375 2.304688 -4.65625 1.984375 -4.28125 C 1.660156 -3.914062 1.5 -3.398438 1.5 -2.734375 C 1.5 -2.066406 1.660156 -1.546875 1.984375 -1.171875 C 2.304688 -0.804688 2.757812 -0.625 3.34375 -0.625 C 3.601562 -0.625 3.859375 -0.65625 4.109375 -0.71875 C 4.367188 -0.789062 4.625 -0.898438 4.875 -1.046875 L 4.875 -0.203125 C 4.625 -0.0859375 4.363281 -0.00390625 4.09375 0.046875 C 3.832031 0.109375 3.550781 0.140625 3.25 0.140625 C 2.414062 0.140625 1.753906 -0.113281 1.265625 -0.625 C 0.785156 -1.144531 0.546875 -1.847656 0.546875 -2.734375 C 0.546875 -3.617188 0.789062 -4.316406 1.28125 -4.828125 C 1.769531 -5.335938 2.441406 -5.59375 3.296875 -5.59375 C 3.578125 -5.59375 3.847656 -5.566406 4.109375 -5.515625 C 4.367188 -5.460938 4.625 -5.378906 4.875 -5.265625 Z M 4.875 -5.265625 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-11">
-<path style="stroke:none;" d="M 5.484375 -3.296875 L 5.484375 0 L 4.59375 0 L 4.59375 -3.265625 C 4.59375 -3.785156 4.488281 -4.171875 4.28125 -4.421875 C 4.082031 -4.679688 3.78125 -4.8125 3.375 -4.8125 C 2.894531 -4.8125 2.515625 -4.65625 2.234375 -4.34375 C 1.953125 -4.039062 1.8125 -3.625 1.8125 -3.09375 L 1.8125 0 L 0.90625 0 L 0.90625 -7.59375 L 1.8125 -7.59375 L 1.8125 -4.625 C 2.03125 -4.945312 2.285156 -5.1875 2.578125 -5.34375 C 2.867188 -5.507812 3.203125 -5.59375 3.578125 -5.59375 C 4.203125 -5.59375 4.675781 -5.398438 5 -5.015625 C 5.320312 -4.628906 5.484375 -4.054688 5.484375 -3.296875 Z M 5.484375 -3.296875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-12">
-<path style="stroke:none;" d="M 0.9375 -5.46875 L 1.84375 -5.46875 L 1.84375 0 L 0.9375 0 Z M 0.9375 -7.59375 L 1.84375 -7.59375 L 1.84375 -6.453125 L 0.9375 -6.453125 Z M 0.9375 -7.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-13">
-<path style="stroke:none;" d="M 5.484375 -3.296875 L 5.484375 0 L 4.59375 0 L 4.59375 -3.265625 C 4.59375 -3.785156 4.488281 -4.171875 4.28125 -4.421875 C 4.082031 -4.679688 3.78125 -4.8125 3.375 -4.8125 C 2.894531 -4.8125 2.515625 -4.65625 2.234375 -4.34375 C 1.953125 -4.039062 1.8125 -3.625 1.8125 -3.09375 L 1.8125 0 L 0.90625 0 L 0.90625 -5.46875 L 1.8125 -5.46875 L 1.8125 -4.625 C 2.03125 -4.945312 2.285156 -5.1875 2.578125 -5.34375 C 2.867188 -5.507812 3.203125 -5.59375 3.578125 -5.59375 C 4.203125 -5.59375 4.675781 -5.398438 5 -5.015625 C 5.320312 -4.628906 5.484375 -4.054688 5.484375 -3.296875 Z M 5.484375 -3.296875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-14">
-<path style="stroke:none;" d="M 0.296875 -5.46875 L 1.25 -5.46875 L 2.953125 -0.875 L 4.671875 -5.46875 L 5.625 -5.46875 L 3.5625 0 L 2.34375 0 Z M 0.296875 -5.46875 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-15">
-<path style="stroke:none;" d="M 1.921875 -0.828125 L 5.359375 -0.828125 L 5.359375 0 L 0.734375 0 L 0.734375 -0.828125 C 1.109375 -1.210938 1.617188 -1.734375 2.265625 -2.390625 C 2.910156 -3.046875 3.316406 -3.46875 3.484375 -3.65625 C 3.796875 -4.007812 4.015625 -4.304688 4.140625 -4.546875 C 4.265625 -4.796875 4.328125 -5.039062 4.328125 -5.28125 C 4.328125 -5.664062 4.191406 -5.976562 3.921875 -6.21875 C 3.648438 -6.46875 3.296875 -6.59375 2.859375 -6.59375 C 2.546875 -6.59375 2.21875 -6.535156 1.875 -6.421875 C 1.539062 -6.316406 1.175781 -6.15625 0.78125 -5.9375 L 0.78125 -6.9375 C 1.175781 -7.09375 1.546875 -7.210938 1.890625 -7.296875 C 2.234375 -7.378906 2.550781 -7.421875 2.84375 -7.421875 C 3.59375 -7.421875 4.191406 -7.234375 4.640625 -6.859375 C 5.097656 -6.484375 5.328125 -5.976562 5.328125 -5.34375 C 5.328125 -5.039062 5.269531 -4.753906 5.15625 -4.484375 C 5.039062 -4.222656 4.835938 -3.910156 4.546875 -3.546875 C 4.460938 -3.453125 4.203125 -3.175781 3.765625 -2.71875 C 3.328125 -2.269531 2.710938 -1.640625 1.921875 -0.828125 Z M 1.921875 -0.828125 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-16">
-<path style="stroke:none;" d="M 3.0625 -4.84375 C 2.582031 -4.84375 2.203125 -4.65625 1.921875 -4.28125 C 1.640625 -3.90625 1.5 -3.390625 1.5 -2.734375 C 1.5 -2.078125 1.632812 -1.5625 1.90625 -1.1875 C 2.1875 -0.8125 2.570312 -0.625 3.0625 -0.625 C 3.539062 -0.625 3.921875 -0.8125 4.203125 -1.1875 C 4.484375 -1.5625 4.625 -2.078125 4.625 -2.734375 C 4.625 -3.378906 4.484375 -3.890625 4.203125 -4.265625 C 3.921875 -4.648438 3.539062 -4.84375 3.0625 -4.84375 Z M 3.0625 -5.59375 C 3.84375 -5.59375 4.457031 -5.335938 4.90625 -4.828125 C 5.351562 -4.328125 5.578125 -3.628906 5.578125 -2.734375 C 5.578125 -1.835938 5.351562 -1.132812 4.90625 -0.625 C 4.457031 -0.113281 3.84375 0.140625 3.0625 0.140625 C 2.28125 0.140625 1.664062 -0.113281 1.21875 -0.625 C 0.769531 -1.132812 0.546875 -1.835938 0.546875 -2.734375 C 0.546875 -3.628906 0.769531 -4.328125 1.21875 -4.828125 C 1.664062 -5.335938 2.28125 -5.59375 3.0625 -5.59375 Z M 3.0625 -5.59375 "/>
-</symbol>
-<symbol overflow="visible" id="glyph1-17">
-<path style="stroke:none;" d="M 4.875 -2.734375 C 4.875 -3.390625 4.734375 -3.90625 4.453125 -4.28125 C 4.179688 -4.65625 3.8125 -4.84375 3.34375 -4.84375 C 2.863281 -4.84375 2.488281 -4.65625 2.21875 -4.28125 C 1.945312 -3.90625 1.8125 -3.390625 1.8125 -2.734375 C 1.8125 -2.066406 1.945312 -1.546875 2.21875 -1.171875 C 2.488281 -0.796875 2.863281 -0.609375 3.34375 -0.609375 C 3.8125 -0.609375 4.179688 -0.796875 4.453125 -1.171875 C 4.734375 -1.546875 4.875 -2.066406 4.875 -2.734375 Z M 1.8125 -4.640625 C 2 -4.960938 2.234375 -5.203125 2.515625 -5.359375 C 2.804688 -5.515625 3.15625 -5.59375 3.5625 -5.59375 C 4.226562 -5.59375 4.765625 -5.328125 5.171875 -4.796875 C 5.585938 -4.273438 5.796875 -3.585938 5.796875 -2.734375 C 5.796875 -1.867188 5.585938 -1.171875 5.171875 -0.640625 C 4.765625 -0.117188 4.226562 0.140625 3.5625 0.140625 C 3.15625 0.140625 2.804688 0.0625 2.515625 -0.09375 C 2.234375 -0.25 2 -0.492188 1.8125 -0.828125 L 1.8125 0 L 0.90625 0 L 0.90625 -7.59375 L 1.8125 -7.59375 Z M 1.8125 -4.640625 "/>
-</symbol>
-</g>
 <clipPath id="clip1">
   <path d="M 18.5 2.5 L 1898 2.5 L 1898 1059 L 18.5 1059 Z M 18.5 2.5 "/>
 </clipPath>
 <clipPath id="clip2">
   <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 213.5 368.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image858" 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="#image858"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
 </mask>
 <clipPath id="clip3">
-  <path d="M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
+  <path d="M 174.5 356.5 L 1744.5 356.5 L 1744.5 540.5 L 174.5 540.5 Z M 174.5 356.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image858"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
 </mask>
 <clipPath id="clip4">
-  <path d="M 1638.5 543.5 L 1657.5 543.5 L 1657.5 563.5 L 1638.5 563.5 Z M 261.5 543.5 L 280.5 543.5 L 280.5 563.5 L 261.5 563.5 Z M 320.5 543.5 L 340.5 543.5 L 340.5 563.5 L 320.5 563.5 Z M 376.5 543.5 L 395.5 543.5 L 395.5 563.5 L 376.5 563.5 Z M 436.5 543.5 L 456.5 543.5 L 456.5 563.5 L 436.5 563.5 Z M 535.5 543.5 L 554.5 543.5 L 554.5 563.5 L 535.5 563.5 Z M 633.5 543.5 L 652.5 543.5 L 652.5 563.5 L 633.5 563.5 Z M 742.5 543.5 L 762.5 543.5 L 762.5 563.5 L 742.5 563.5 Z M 849.5 543.5 L 868.5 543.5 L 868.5 563.5 L 849.5 563.5 Z M 970.5 543.5 L 989.5 543.5 L 989.5 563.5 L 970.5 563.5 Z M 1068.5 543.5 L 1088.5 543.5 L 1088.5 563.5 L 1068.5 563.5 Z M 1167.5 543.5 L 1186.5 543.5 L 1186.5 563.5 L 1167.5 563.5 Z M 1265.5 543.5 L 1285.5 543.5 L 1285.5 563.5 L 1265.5 563.5 Z M 1363.5 543.5 L 1383.5 543.5 L 1383.5 563.5 L 1363.5 563.5 Z M 1462.5 543.5 L 1481.5 543.5 L 1481.5 563.5 L 1462.5 563.5 Z M 1524.5 543.5 L 1543.5 543.5 L 1543.5 563.5 L 1524.5 563.5 Z M 1579.5 543.5 L 1599.5 543.5 L 1599.5 563.5 L 1579.5 563.5 Z M 1579.5 543.5 "/>
+  <path d="M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
 </clipPath>
-<clipPath id="clip5">
-  <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 842.5 540.5 L 875.5 540.5 L 875.5 543.5 L 842.5 543.5 Z M 369.5 540.5 L 402.5 540.5 L 402.5 543.5 L 369.5 543.5 Z M 735.5 540.5 L 769.5 540.5 L 769.5 543.5 L 735.5 543.5 Z M 963.5 540.5 L 996.5 540.5 L 996.5 543.5 L 963.5 543.5 Z M 1357.5 540.5 L 1390.5 540.5 L 1390.5 543.5 L 1357.5 543.5 Z M 1623.5 540.5 L 1664.5 540.5 L 1664.5 543.5 L 1623.5 543.5 Z M 1258.5 540.5 L 1291.5 540.5 L 1291.5 543.5 L 1258.5 543.5 Z M 313.5 540.5 L 346.5 540.5 L 346.5 543.5 L 313.5 543.5 Z M 429.5 540.5 L 463.5 540.5 L 463.5 543.5 L 429.5 543.5 Z M 1517.5 540.5 L 1550.5 540.5 L 1550.5 543.5 L 1517.5 543.5 Z M 1455.5 540.5 L 1488.5 540.5 L 1488.5 543.5 L 1455.5 543.5 Z M 1160.5 540.5 L 1193.5 540.5 L 1193.5 543.5 L 1160.5 543.5 Z M 528.5 540.5 L 561.5 540.5 L 561.5 543.5 L 528.5 543.5 Z M 626.5 540.5 L 659.5 540.5 L 659.5 543.5 L 626.5 543.5 Z M 254.5 540.5 L 296.5 540.5 L 296.5 543.5 L 254.5 543.5 Z M 1572.5 540.5 L 1605.5 540.5 L 1605.5 543.5 L 1572.5 543.5 Z M 1061.5 540.5 L 1095.5 540.5 L 1095.5 543.5 L 1061.5 543.5 Z M 1455.5 543.5 L 1488.5 543.5 L 1488.5 545.5 L 1455.5 545.5 Z M 528.5 543.5 L 561.5 543.5 L 561.5 545.5 L 528.5 545.5 Z M 1160.5 543.5 L 1193.5 543.5 L 1193.5 545.5 L 1160.5 545.5 Z M 626.5 543.5 L 659.5 543.5 L 659.5 545.5 L 626.5 545.5 Z M 1357.5 543.5 L 1390.5 543.5 L 1390.5 545.5 L 1357.5 545.5 Z M 1572.5 543.5 L 1605.5 543.5 L 1605.5 545.5 L 1572.5 545.5 Z M 369.5 543.5 L 402.5 543.5 L 402.5 545.5 L 369.5 545.5 Z M 1061.5 543.5 L 1095.5 543.5 L 1095.5 545.5 L 1061.5 545.5 Z M 842.5 543.5 L 875.5 543.5 L 875.5 545.5 L 842.5 545.5 Z M 963.5 543.5 L 996.5 543.5 L 996.5 545.5 L 963.5 545.5 Z M 313.5 543.5 L 346.5 543.5 L 346.5 545.5 L 313.5 545.5 Z M 429.5 543.5 L 463.5 543.5 L 463.5 545.5 L 429.5 545.5 Z M 735.5 543.5 L 769.5 543.5 L 769.5 545.5 L 735.5 545.5 Z M 1258.5 543.5 L 1291.5 543.5 L 1291.5 545.5 L 1258.5 545.5 Z M 1517.5 543.5 L 1550.5 543.5 L 1550.5 545.5 L 1517.5 545.5 Z M 313.5 545.5 L 402.5 545.5 L 402.5 561.5 L 313.5 561.5 Z M 429.5 545.5 L 659.5 545.5 L 659.5 561.5 L 429.5 561.5 Z M 735.5 545.5 L 1193.5 545.5 L 1193.5 561.5 L 735.5 561.5 Z M 1258.5 545.5 L 1488.5 545.5 L 1488.5 561.5 L 1258.5 561.5 Z M 1517.5 545.5 L 1605.5 545.5 L 1605.5 561.5 L 1517.5 561.5 Z M 963.5 561.5 L 996.5 561.5 L 996.5 563.5 L 963.5 563.5 Z M 1517.5 561.5 L 1550.5 561.5 L 1550.5 563.5 L 1517.5 563.5 Z M 429.5 561.5 L 463.5 561.5 L 463.5 563.5 L 429.5 563.5 Z M 1258.5 561.5 L 1291.5 561.5 L 1291.5 563.5 L 1258.5 563.5 Z M 313.5 561.5 L 346.5 561.5 L 346.5 563.5 L 313.5 563.5 Z M 735.5 561.5 L 769.5 561.5 L 769.5 563.5 L 735.5 563.5 Z M 528.5 561.5 L 561.5 561.5 L 561.5 563.5 L 528.5 563.5 Z M 1160.5 561.5 L 1193.5 561.5 L 1193.5 563.5 L 1160.5 563.5 Z M 626.5 561.5 L 659.5 561.5 L 659.5 563.5 L 626.5 563.5 Z M 369.5 561.5 L 402.5 561.5 L 402.5 563.5 L 369.5 563.5 Z M 1455.5 561.5 L 1488.5 561.5 L 1488.5 563.5 L 1455.5 563.5 Z M 842.5 561.5 L 875.5 561.5 L 875.5 563.5 L 842.5 563.5 Z M 1623.5 543.5 L 1664.5 543.5 L 1664.5 563.5 L 1623.5 563.5 Z M 1061.5 561.5 L 1095.5 561.5 L 1095.5 563.5 L 1061.5 563.5 Z M 1572.5 561.5 L 1605.5 561.5 L 1605.5 563.5 L 1572.5 563.5 Z M 254.5 543.5 L 296.5 543.5 L 296.5 563.5 L 254.5 563.5 Z M 1357.5 561.5 L 1390.5 561.5 L 1390.5 563.5 L 1357.5 563.5 Z M 313.5 563.5 L 346.5 563.5 L 346.5 566.5 L 313.5 566.5 Z M 528.5 563.5 L 561.5 563.5 L 561.5 566.5 L 528.5 566.5 Z M 1258.5 563.5 L 1291.5 563.5 L 1291.5 566.5 L 1258.5 566.5 Z M 1455.5 563.5 L 1488.5 563.5 L 1488.5 566.5 L 1455.5 566.5 Z M 842.5 563.5 L 875.5 563.5 L 875.5 566.5 L 842.5 566.5 Z M 254.5 563.5 L 296.5 563.5 L 296.5 566.5 L 254.5 566.5 Z M 1623.5 563.5 L 1664.5 563.5 L 1664.5 566.5 L 1623.5 566.5 Z M 1517.5 563.5 L 1550.5 563.5 L 1550.5 566.5 L 1517.5 566.5 Z M 735.5 563.5 L 769.5 563.5 L 769.5 566.5 L 735.5 566.5 Z M 1061.5 563.5 L 1095.5 563.5 L 1095.5 566.5 L 1061.5 566.5 Z M 429.5 563.5 L 463.5 563.5 L 463.5 566.5 L 429.5 566.5 Z M 1357.5 563.5 L 1390.5 563.5 L 1390.5 566.5 L 1357.5 566.5 Z M 1160.5 563.5 L 1193.5 563.5 L 1193.5 566.5 L 1160.5 566.5 Z M 1572.5 563.5 L 1605.5 563.5 L 1605.5 566.5 L 1572.5 566.5 Z M 369.5 563.5 L 402.5 563.5 L 402.5 566.5 L 369.5 566.5 Z M 626.5 563.5 L 659.5 563.5 L 659.5 566.5 L 626.5 566.5 Z M 963.5 563.5 L 996.5 563.5 L 996.5 566.5 L 963.5 566.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
-</clipPath>
-<clipPath id="clip6">
-  <path d="M 1638.5 543.5 L 1657.5 543.5 L 1657.5 563.5 L 1638.5 563.5 Z M 261.5 543.5 L 280.5 543.5 L 280.5 563.5 L 261.5 563.5 Z M 320.5 543.5 L 340.5 543.5 L 340.5 563.5 L 320.5 563.5 Z M 376.5 543.5 L 395.5 543.5 L 395.5 563.5 L 376.5 563.5 Z M 436.5 543.5 L 456.5 543.5 L 456.5 563.5 L 436.5 563.5 Z M 535.5 543.5 L 554.5 543.5 L 554.5 563.5 L 535.5 563.5 Z M 633.5 543.5 L 652.5 543.5 L 652.5 563.5 L 633.5 563.5 Z M 742.5 543.5 L 762.5 543.5 L 762.5 563.5 L 742.5 563.5 Z M 849.5 543.5 L 868.5 543.5 L 868.5 563.5 L 849.5 563.5 Z M 970.5 543.5 L 989.5 543.5 L 989.5 563.5 L 970.5 563.5 Z M 1068.5 543.5 L 1088.5 543.5 L 1088.5 563.5 L 1068.5 563.5 Z M 1167.5 543.5 L 1186.5 543.5 L 1186.5 563.5 L 1167.5 563.5 Z M 1265.5 543.5 L 1285.5 543.5 L 1285.5 563.5 L 1265.5 563.5 Z M 1363.5 543.5 L 1383.5 543.5 L 1383.5 563.5 L 1363.5 563.5 Z M 1462.5 543.5 L 1481.5 543.5 L 1481.5 563.5 L 1462.5 563.5 Z M 1524.5 543.5 L 1543.5 543.5 L 1543.5 563.5 L 1524.5 563.5 Z M 1579.5 543.5 L 1599.5 543.5 L 1599.5 563.5 L 1579.5 563.5 Z M 1579.5 543.5 "/>
-</clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image858"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
+<clipPath id="clip5">
+  <path d="M 897.5 680.5 L 916.5 680.5 L 916.5 699.5 L 897.5 699.5 Z M 1581.5 680.5 L 1600.5 680.5 L 1600.5 699.5 L 1581.5 699.5 Z M 318.5 680.5 L 337.5 680.5 L 337.5 699.5 L 318.5 699.5 Z M 1318.5 680.5 L 1338.5 680.5 L 1338.5 699.5 L 1318.5 699.5 Z M 580.5 680.5 L 600.5 680.5 L 600.5 699.5 L 580.5 699.5 Z M 1055.5 680.5 L 1075.5 680.5 L 1075.5 699.5 L 1055.5 699.5 Z M 844.5 680.5 L 863.5 680.5 L 863.5 699.5 L 844.5 699.5 Z M 844.5 680.5 "/>
+</clipPath>
+<pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image858"/>
+</pattern>
+<mask id="mask3">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
+</mask>
+<clipPath id="clip6">
+  <path d="M 1611.5 390.5 L 1628.5 390.5 L 1628.5 405.5 L 1611.5 405.5 Z M 1227.5 390.5 L 1244.5 390.5 L 1244.5 405.5 L 1227.5 405.5 Z M 1659.5 390.5 L 1676.5 390.5 L 1676.5 405.5 L 1659.5 405.5 Z M 552.5 390.5 L 570.5 390.5 L 570.5 405.5 L 552.5 405.5 Z M 1349.5 390.5 L 1366.5 390.5 L 1366.5 405.5 L 1349.5 405.5 Z M 1445.5 390.5 L 1462.5 390.5 L 1462.5 405.5 L 1445.5 405.5 Z M 1397.5 390.5 L 1414.5 390.5 L 1414.5 405.5 L 1397.5 405.5 Z M 1131.5 390.5 L 1148.5 390.5 L 1148.5 405.5 L 1131.5 405.5 Z M 242.5 390.5 L 260.5 390.5 L 260.5 405.5 L 242.5 405.5 Z M 290.5 390.5 L 308.5 390.5 L 308.5 405.5 L 290.5 405.5 Z M 722.5 390.5 L 739.5 390.5 L 739.5 405.5 L 722.5 405.5 Z M 408.5 390.5 L 425.5 390.5 L 425.5 405.5 L 408.5 405.5 Z M 456.5 390.5 L 473.5 390.5 L 473.5 405.5 L 456.5 405.5 Z M 504.5 390.5 L 522.5 390.5 L 522.5 405.5 L 504.5 405.5 Z M 1493.5 390.5 L 1510.5 390.5 L 1510.5 405.5 L 1493.5 405.5 Z M 674.5 390.5 L 691.5 390.5 L 691.5 405.5 L 674.5 405.5 Z M 770.5 390.5 L 787.5 390.5 L 787.5 405.5 L 770.5 405.5 Z M 818.5 390.5 L 835.5 390.5 L 835.5 405.5 L 818.5 405.5 Z M 1179.5 390.5 L 1196.5 390.5 L 1196.5 405.5 L 1179.5 405.5 Z M 1083.5 390.5 L 1100.5 390.5 L 1100.5 405.5 L 1083.5 405.5 Z M 892.5 390.5 L 947.5 390.5 L 947.5 412.5 L 892.5 412.5 Z M 971.5 390.5 L 1026.5 390.5 L 1026.5 412.5 L 971.5 412.5 Z M 892.5 412.5 L 947.5 412.5 L 947.5 432.5 L 892.5 432.5 Z M 971.5 412.5 L 1026.5 412.5 L 1026.5 432.5 L 971.5 432.5 Z M 892.5 432.5 L 947.5 432.5 L 947.5 451.5 L 892.5 451.5 Z M 971.5 432.5 L 1026.5 432.5 L 1026.5 451.5 L 971.5 451.5 Z M 971.5 451.5 L 1026.5 451.5 L 1026.5 471.5 L 971.5 471.5 Z M 892.5 451.5 L 947.5 451.5 L 947.5 471.5 L 892.5 471.5 Z M 722.5 519.5 L 739.5 519.5 L 739.5 538.5 L 722.5 538.5 Z M 1445.5 519.5 L 1462.5 519.5 L 1462.5 538.5 L 1445.5 538.5 Z M 1611.5 519.5 L 1628.5 519.5 L 1628.5 538.5 L 1611.5 538.5 Z M 456.5 519.5 L 473.5 519.5 L 473.5 538.5 L 456.5 538.5 Z M 674.5 519.5 L 691.5 519.5 L 691.5 538.5 L 674.5 538.5 Z M 1659.5 519.5 L 1676.5 519.5 L 1676.5 538.5 L 1659.5 538.5 Z M 552.5 519.5 L 570.5 519.5 L 570.5 538.5 L 552.5 538.5 Z M 770.5 519.5 L 787.5 519.5 L 787.5 538.5 L 770.5 538.5 Z M 1493.5 519.5 L 1510.5 519.5 L 1510.5 538.5 L 1493.5 538.5 Z M 1227.5 519.5 L 1244.5 519.5 L 1244.5 538.5 L 1227.5 538.5 Z M 1179.5 519.5 L 1196.5 519.5 L 1196.5 538.5 L 1179.5 538.5 Z M 504.5 519.5 L 522.5 519.5 L 522.5 538.5 L 504.5 538.5 Z M 1083.5 519.5 L 1100.5 519.5 L 1100.5 538.5 L 1083.5 538.5 Z M 1397.5 519.5 L 1414.5 519.5 L 1414.5 538.5 L 1397.5 538.5 Z M 408.5 519.5 L 425.5 519.5 L 425.5 538.5 L 408.5 538.5 Z M 818.5 519.5 L 835.5 519.5 L 835.5 538.5 L 818.5 538.5 Z M 1349.5 519.5 L 1366.5 519.5 L 1366.5 538.5 L 1349.5 538.5 Z M 290.5 519.5 L 308.5 519.5 L 308.5 538.5 L 290.5 538.5 Z M 242.5 519.5 L 260.5 519.5 L 260.5 538.5 L 242.5 538.5 Z M 1131.5 519.5 L 1148.5 519.5 L 1148.5 538.5 L 1131.5 538.5 Z M 1349.5 538.5 L 1414.5 538.5 L 1414.5 547.5 L 1349.5 547.5 Z M 1576.5 538.5 L 1676.5 538.5 L 1676.5 547.5 L 1576.5 547.5 Z M 770.5 538.5 L 835.5 538.5 L 835.5 547.5 L 770.5 547.5 Z M 1445.5 538.5 L 1510.5 538.5 L 1510.5 547.5 L 1445.5 547.5 Z M 504.5 538.5 L 570.5 538.5 L 570.5 547.5 L 504.5 547.5 Z M 1179.5 538.5 L 1244.5 538.5 L 1244.5 547.5 L 1179.5 547.5 Z M 242.5 538.5 L 342.5 538.5 L 342.5 547.5 L 242.5 547.5 Z M 674.5 538.5 L 739.5 538.5 L 739.5 547.5 L 674.5 547.5 Z M 1083.5 538.5 L 1148.5 538.5 L 1148.5 547.5 L 1083.5 547.5 Z M 408.5 538.5 L 473.5 538.5 L 473.5 547.5 L 408.5 547.5 Z M 971.5 471.5 L 1026.5 471.5 L 1026.5 551.5 L 971.5 551.5 Z M 892.5 471.5 L 947.5 471.5 L 947.5 551.5 L 892.5 551.5 Z M 971.5 551.5 L 1026.5 551.5 L 1026.5 557.5 L 971.5 557.5 Z M 892.5 551.5 L 947.5 551.5 L 947.5 557.5 L 892.5 557.5 Z M 674.5 547.5 L 739.5 547.5 L 739.5 566.5 L 674.5 566.5 Z M 1349.5 547.5 L 1414.5 547.5 L 1414.5 566.5 L 1349.5 566.5 Z M 242.5 547.5 L 342.5 547.5 L 342.5 566.5 L 242.5 566.5 Z M 1179.5 547.5 L 1244.5 547.5 L 1244.5 566.5 L 1179.5 566.5 Z M 1576.5 547.5 L 1676.5 547.5 L 1676.5 566.5 L 1576.5 566.5 Z M 1083.5 547.5 L 1148.5 547.5 L 1148.5 566.5 L 1083.5 566.5 Z M 504.5 547.5 L 570.5 547.5 L 570.5 566.5 L 504.5 566.5 Z M 770.5 547.5 L 835.5 547.5 L 835.5 566.5 L 770.5 566.5 Z M 1445.5 547.5 L 1510.5 547.5 L 1510.5 566.5 L 1445.5 566.5 Z M 408.5 547.5 L 473.5 547.5 L 473.5 566.5 L 408.5 566.5 Z M 674.5 566.5 L 739.5 566.5 L 739.5 575.5 L 674.5 575.5 Z M 1576.5 566.5 L 1676.5 566.5 L 1676.5 575.5 L 1576.5 575.5 Z M 504.5 566.5 L 570.5 566.5 L 570.5 575.5 L 504.5 575.5 Z M 1349.5 566.5 L 1414.5 566.5 L 1414.5 575.5 L 1349.5 575.5 Z M 408.5 566.5 L 473.5 566.5 L 473.5 575.5 L 408.5 575.5 Z M 770.5 566.5 L 835.5 566.5 L 835.5 575.5 L 770.5 575.5 Z M 1083.5 566.5 L 1148.5 566.5 L 1148.5 575.5 L 1083.5 575.5 Z M 1179.5 566.5 L 1244.5 566.5 L 1244.5 575.5 L 1179.5 575.5 Z M 1445.5 566.5 L 1510.5 566.5 L 1510.5 575.5 L 1445.5 575.5 Z M 242.5 566.5 L 342.5 566.5 L 342.5 575.5 L 242.5 575.5 Z M 1445.5 575.5 L 1462.5 575.5 L 1462.5 588.5 L 1445.5 588.5 Z M 1397.5 575.5 L 1414.5 575.5 L 1414.5 588.5 L 1397.5 588.5 Z M 722.5 575.5 L 739.5 575.5 L 739.5 588.5 L 722.5 588.5 Z M 504.5 575.5 L 522.5 575.5 L 522.5 588.5 L 504.5 588.5 Z M 674.5 575.5 L 691.5 575.5 L 691.5 588.5 L 674.5 588.5 Z M 1349.5 575.5 L 1366.5 575.5 L 1366.5 588.5 L 1349.5 588.5 Z M 770.5 575.5 L 787.5 575.5 L 787.5 588.5 L 770.5 588.5 Z M 1179.5 575.5 L 1196.5 575.5 L 1196.5 588.5 L 1179.5 588.5 Z M 1083.5 575.5 L 1100.5 575.5 L 1100.5 588.5 L 1083.5 588.5 Z M 552.5 575.5 L 570.5 575.5 L 570.5 588.5 L 552.5 588.5 Z M 1131.5 575.5 L 1148.5 575.5 L 1148.5 588.5 L 1131.5 588.5 Z M 408.5 575.5 L 425.5 575.5 L 425.5 588.5 L 408.5 588.5 Z M 1611.5 575.5 L 1628.5 575.5 L 1628.5 588.5 L 1611.5 588.5 Z M 242.5 575.5 L 260.5 575.5 L 260.5 588.5 L 242.5 588.5 Z M 818.5 575.5 L 835.5 575.5 L 835.5 588.5 L 818.5 588.5 Z M 456.5 575.5 L 473.5 575.5 L 473.5 588.5 L 456.5 588.5 Z M 1227.5 575.5 L 1244.5 575.5 L 1244.5 588.5 L 1227.5 588.5 Z M 1493.5 575.5 L 1510.5 575.5 L 1510.5 588.5 L 1493.5 588.5 Z M 290.5 575.5 L 308.5 575.5 L 308.5 588.5 L 290.5 588.5 Z M 1659.5 575.5 L 1676.5 575.5 L 1676.5 588.5 L 1659.5 588.5 Z M 892.5 557.5 L 947.5 557.5 L 947.5 602.5 L 892.5 602.5 Z M 971.5 557.5 L 1026.5 557.5 L 1026.5 604.5 L 971.5 604.5 Z M 892.5 602.5 L 947.5 602.5 L 947.5 621.5 L 892.5 621.5 Z M 971.5 604.5 L 1026.5 604.5 L 1026.5 624.5 L 971.5 624.5 Z M 892.5 621.5 L 947.5 621.5 L 947.5 641.5 L 892.5 641.5 Z M 971.5 624.5 L 1026.5 624.5 L 1026.5 643.5 L 971.5 643.5 Z M 892.5 641.5 L 947.5 641.5 L 947.5 660.5 L 892.5 660.5 Z M 971.5 643.5 L 1026.5 643.5 L 1026.5 662.5 L 971.5 662.5 Z M 552.5 662.5 L 570.5 662.5 L 570.5 677.5 L 552.5 677.5 Z M 818.5 662.5 L 835.5 662.5 L 835.5 677.5 L 818.5 677.5 Z M 1445.5 662.5 L 1462.5 662.5 L 1462.5 677.5 L 1445.5 677.5 Z M 674.5 662.5 L 691.5 662.5 L 691.5 677.5 L 674.5 677.5 Z M 1227.5 662.5 L 1244.5 662.5 L 1244.5 677.5 L 1227.5 677.5 Z M 1179.5 662.5 L 1196.5 662.5 L 1196.5 677.5 L 1179.5 677.5 Z M 1131.5 662.5 L 1148.5 662.5 L 1148.5 677.5 L 1131.5 677.5 Z M 1083.5 662.5 L 1100.5 662.5 L 1100.5 677.5 L 1083.5 677.5 Z M 770.5 662.5 L 787.5 662.5 L 787.5 677.5 L 770.5 677.5 Z M 722.5 662.5 L 739.5 662.5 L 739.5 677.5 L 722.5 677.5 Z M 1349.5 662.5 L 1366.5 662.5 L 1366.5 677.5 L 1349.5 677.5 Z M 242.5 662.5 L 260.5 662.5 L 260.5 677.5 L 242.5 677.5 Z M 290.5 662.5 L 308.5 662.5 L 308.5 677.5 L 290.5 677.5 Z M 456.5 662.5 L 473.5 662.5 L 473.5 677.5 L 456.5 677.5 Z M 504.5 662.5 L 522.5 662.5 L 522.5 677.5 L 504.5 677.5 Z M 1493.5 662.5 L 1510.5 662.5 L 1510.5 677.5 L 1493.5 677.5 Z M 408.5 662.5 L 425.5 662.5 L 425.5 677.5 L 408.5 677.5 Z M 1397.5 662.5 L 1414.5 662.5 L 1414.5 677.5 L 1397.5 677.5 Z M 1611.5 662.5 L 1628.5 662.5 L 1628.5 677.5 L 1611.5 677.5 Z M 892.5 660.5 L 947.5 660.5 L 947.5 677.5 L 892.5 677.5 Z M 1659.5 662.5 L 1676.5 662.5 L 1676.5 677.5 L 1659.5 677.5 Z M 971.5 662.5 L 1026.5 662.5 L 1026.5 677.5 L 971.5 677.5 Z M 971.5 662.5 "/>
+</clipPath>
 <clipPath id="clip7">
-  <path d="M 1585 466 L 1744.5 466 L 1744.5 485 L 1585 485 Z M 1585 466 "/>
+  <path d="M 691.5 588.5 L 722.5 588.5 L 722.5 595.5 L 691.5 595.5 Z M 213.5 588.5 L 242.5 588.5 L 242.5 595.5 L 213.5 595.5 Z M 260.5 588.5 L 290.5 588.5 L 290.5 595.5 L 260.5 595.5 Z M 308.5 588.5 L 337.5 588.5 L 337.5 595.5 L 308.5 595.5 Z M 1196.5 588.5 L 1227.5 588.5 L 1227.5 595.5 L 1196.5 595.5 Z M 1676.5 588.5 L 1705.5 588.5 L 1705.5 595.5 L 1676.5 595.5 Z M 1628.5 588.5 L 1659.5 588.5 L 1659.5 595.5 L 1628.5 595.5 Z M 1581.5 588.5 L 1611.5 588.5 L 1611.5 595.5 L 1581.5 595.5 Z M 1366.5 588.5 L 1397.5 588.5 L 1397.5 596.5 L 1366.5 596.5 Z M 1317.5 588.5 L 1349.5 588.5 L 1349.5 596.5 L 1317.5 596.5 Z M 1462.5 588.5 L 1493.5 588.5 L 1493.5 596.5 L 1462.5 596.5 Z M 425.5 588.5 L 456.5 588.5 L 456.5 596.5 L 425.5 596.5 Z M 522.5 588.5 L 552.5 588.5 L 552.5 596.5 L 522.5 596.5 Z M 570.5 588.5 L 602.5 588.5 L 602.5 596.5 L 570.5 596.5 Z M 1148.5 588.5 L 1179.5 588.5 L 1179.5 597.5 L 1148.5 597.5 Z M 835.5 588.5 L 865.5 588.5 L 865.5 597.5 L 835.5 597.5 Z M 1053.5 588.5 L 1083.5 588.5 L 1083.5 597.5 L 1053.5 597.5 Z M 739.5 588.5 L 770.5 588.5 L 770.5 597.5 L 739.5 597.5 Z M 1196.5 595.5 L 1227.5 595.5 L 1227.5 614.5 L 1196.5 614.5 Z M 213.5 595.5 L 242.5 595.5 L 242.5 614.5 L 213.5 614.5 Z M 260.5 595.5 L 290.5 595.5 L 290.5 614.5 L 260.5 614.5 Z M 308.5 595.5 L 337.5 595.5 L 337.5 614.5 L 308.5 614.5 Z M 1676.5 595.5 L 1705.5 595.5 L 1705.5 614.5 L 1676.5 614.5 Z M 1581.5 595.5 L 1611.5 595.5 L 1611.5 614.5 L 1581.5 614.5 Z M 1628.5 595.5 L 1659.5 595.5 L 1659.5 614.5 L 1628.5 614.5 Z M 691.5 595.5 L 722.5 595.5 L 722.5 614.5 L 691.5 614.5 Z M 1317.5 596.5 L 1349.5 596.5 L 1349.5 616.5 L 1317.5 616.5 Z M 425.5 596.5 L 456.5 596.5 L 456.5 616.5 L 425.5 616.5 Z M 522.5 596.5 L 552.5 596.5 L 552.5 616.5 L 522.5 616.5 Z M 570.5 596.5 L 602.5 596.5 L 602.5 616.5 L 570.5 616.5 Z M 1462.5 596.5 L 1493.5 596.5 L 1493.5 616.5 L 1462.5 616.5 Z M 1366.5 596.5 L 1397.5 596.5 L 1397.5 616.5 L 1366.5 616.5 Z M 1053.5 597.5 L 1083.5 597.5 L 1083.5 617.5 L 1053.5 617.5 Z M 1148.5 597.5 L 1179.5 597.5 L 1179.5 617.5 L 1148.5 617.5 Z M 835.5 597.5 L 865.5 597.5 L 865.5 617.5 L 835.5 617.5 Z M 739.5 597.5 L 770.5 597.5 L 770.5 617.5 L 739.5 617.5 Z M 1317.5 616.5 L 1349.5 616.5 L 1349.5 635.5 L 1317.5 635.5 Z M 570.5 616.5 L 602.5 616.5 L 602.5 635.5 L 570.5 635.5 Z M 1510.5 588.5 L 1540.5 588.5 L 1540.5 635.5 L 1510.5 635.5 Z M 1414.5 588.5 L 1445.5 588.5 L 1445.5 635.5 L 1414.5 635.5 Z M 1366.5 616.5 L 1397.5 616.5 L 1397.5 635.5 L 1366.5 635.5 Z M 425.5 616.5 L 456.5 616.5 L 456.5 635.5 L 425.5 635.5 Z M 522.5 616.5 L 552.5 616.5 L 552.5 635.5 L 522.5 635.5 Z M 379.5 588.5 L 408.5 588.5 L 408.5 635.5 L 379.5 635.5 Z M 1462.5 616.5 L 1493.5 616.5 L 1493.5 635.5 L 1462.5 635.5 Z M 473.5 588.5 L 504.5 588.5 L 504.5 635.5 L 473.5 635.5 Z M 1053.5 617.5 L 1083.5 617.5 L 1083.5 636.5 L 1053.5 636.5 Z M 787.5 588.5 L 818.5 588.5 L 818.5 636.5 L 787.5 636.5 Z M 260.5 614.5 L 290.5 614.5 L 290.5 636.5 L 260.5 636.5 Z M 1148.5 617.5 L 1179.5 617.5 L 1179.5 636.5 L 1148.5 636.5 Z M 739.5 617.5 L 770.5 617.5 L 770.5 636.5 L 739.5 636.5 Z M 1676.5 614.5 L 1705.5 614.5 L 1705.5 636.5 L 1676.5 636.5 Z M 1581.5 614.5 L 1611.5 614.5 L 1611.5 636.5 L 1581.5 636.5 Z M 835.5 617.5 L 865.5 617.5 L 865.5 636.5 L 835.5 636.5 Z M 213.5 614.5 L 242.5 614.5 L 242.5 636.5 L 213.5 636.5 Z M 1628.5 614.5 L 1659.5 614.5 L 1659.5 636.5 L 1628.5 636.5 Z M 1244.5 588.5 L 1274.5 588.5 L 1274.5 636.5 L 1244.5 636.5 Z M 1100.5 588.5 L 1131.5 588.5 L 1131.5 636.5 L 1100.5 636.5 Z M 644.5 588.5 L 674.5 588.5 L 674.5 636.5 L 644.5 636.5 Z M 308.5 614.5 L 337.5 614.5 L 337.5 636.5 L 308.5 636.5 Z M 473.5 635.5 L 504.5 635.5 L 504.5 654.5 L 473.5 654.5 Z M 1317.5 635.5 L 1349.5 635.5 L 1349.5 654.5 L 1317.5 654.5 Z M 522.5 635.5 L 552.5 635.5 L 552.5 654.5 L 522.5 654.5 Z M 1462.5 635.5 L 1493.5 635.5 L 1493.5 654.5 L 1462.5 654.5 Z M 570.5 635.5 L 602.5 635.5 L 602.5 654.5 L 570.5 654.5 Z M 1366.5 635.5 L 1397.5 635.5 L 1397.5 654.5 L 1366.5 654.5 Z M 1510.5 635.5 L 1540.5 635.5 L 1540.5 654.5 L 1510.5 654.5 Z M 1414.5 635.5 L 1445.5 635.5 L 1445.5 654.5 L 1414.5 654.5 Z M 379.5 635.5 L 408.5 635.5 L 408.5 654.5 L 379.5 654.5 Z M 425.5 635.5 L 456.5 635.5 L 456.5 654.5 L 425.5 654.5 Z M 1148.5 636.5 L 1179.5 636.5 L 1179.5 656.5 L 1148.5 656.5 Z M 1581.5 636.5 L 1611.5 636.5 L 1611.5 656.5 L 1581.5 656.5 Z M 260.5 636.5 L 290.5 636.5 L 290.5 656.5 L 260.5 656.5 Z M 1100.5 636.5 L 1131.5 636.5 L 1131.5 656.5 L 1100.5 656.5 Z M 213.5 636.5 L 242.5 636.5 L 242.5 656.5 L 213.5 656.5 Z M 1676.5 636.5 L 1705.5 636.5 L 1705.5 656.5 L 1676.5 656.5 Z M 787.5 636.5 L 818.5 636.5 L 818.5 656.5 L 787.5 656.5 Z M 1053.5 636.5 L 1083.5 636.5 L 1083.5 656.5 L 1053.5 656.5 Z M 739.5 636.5 L 770.5 636.5 L 770.5 656.5 L 739.5 656.5 Z M 644.5 636.5 L 674.5 636.5 L 674.5 656.5 L 644.5 656.5 Z M 1628.5 636.5 L 1659.5 636.5 L 1659.5 656.5 L 1628.5 656.5 Z M 835.5 636.5 L 865.5 636.5 L 865.5 656.5 L 835.5 656.5 Z M 308.5 636.5 L 337.5 636.5 L 337.5 656.5 L 308.5 656.5 Z M 1244.5 636.5 L 1274.5 636.5 L 1274.5 656.5 L 1244.5 656.5 Z M 1510.5 654.5 L 1540.5 654.5 L 1540.5 662.5 L 1510.5 662.5 Z M 570.5 654.5 L 602.5 654.5 L 602.5 662.5 L 570.5 662.5 Z M 835.5 656.5 L 865.5 656.5 L 865.5 662.5 L 835.5 662.5 Z M 1414.5 654.5 L 1445.5 654.5 L 1445.5 662.5 L 1414.5 662.5 Z M 1366.5 654.5 L 1397.5 654.5 L 1397.5 662.5 L 1366.5 662.5 Z M 691.5 614.5 L 722.5 614.5 L 722.5 662.5 L 691.5 662.5 Z M 1462.5 654.5 L 1493.5 654.5 L 1493.5 662.5 L 1462.5 662.5 Z M 787.5 656.5 L 818.5 656.5 L 818.5 662.5 L 787.5 662.5 Z M 522.5 654.5 L 552.5 654.5 L 552.5 662.5 L 522.5 662.5 Z M 1100.5 656.5 L 1131.5 656.5 L 1131.5 662.5 L 1100.5 662.5 Z M 308.5 656.5 L 337.5 656.5 L 337.5 662.5 L 308.5 662.5 Z M 1581.5 656.5 L 1611.5 656.5 L 1611.5 662.5 L 1581.5 662.5 Z M 425.5 654.5 L 456.5 654.5 L 456.5 662.5 L 425.5 662.5 Z M 1196.5 614.5 L 1227.5 614.5 L 1227.5 662.5 L 1196.5 662.5 Z M 1053.5 656.5 L 1083.5 656.5 L 1083.5 662.5 L 1053.5 662.5 Z M 379.5 654.5 L 408.5 654.5 L 408.5 662.5 L 379.5 662.5 Z M 644.5 656.5 L 674.5 656.5 L 674.5 662.5 L 644.5 662.5 Z M 739.5 656.5 L 770.5 656.5 L 770.5 662.5 L 739.5 662.5 Z M 1148.5 656.5 L 1179.5 656.5 L 1179.5 662.5 L 1148.5 662.5 Z M 260.5 656.5 L 290.5 656.5 L 290.5 662.5 L 260.5 662.5 Z M 1628.5 656.5 L 1659.5 656.5 L 1659.5 662.5 L 1628.5 662.5 Z M 213.5 656.5 L 242.5 656.5 L 242.5 662.5 L 213.5 662.5 Z M 1317.5 654.5 L 1349.5 654.5 L 1349.5 662.5 L 1317.5 662.5 Z M 1244.5 656.5 L 1274.5 656.5 L 1274.5 662.5 L 1244.5 662.5 Z M 1676.5 656.5 L 1705.5 656.5 L 1705.5 662.5 L 1676.5 662.5 Z M 473.5 654.5 L 504.5 654.5 L 504.5 662.5 L 473.5 662.5 Z M 473.5 654.5 "/>
 </clipPath>
 <clipPath id="clip8">
-  <path d="M 1542.5 595 L 1657 595 L 1657 606 L 1542.5 606 Z M 1542.5 595 "/>
+  <path d="M 644.5 405.5 L 674.5 405.5 L 674.5 412.5 L 644.5 412.5 Z M 691.5 405.5 L 722.5 405.5 L 722.5 412.5 L 691.5 412.5 Z M 787.5 405.5 L 818.5 405.5 L 818.5 412.5 L 787.5 412.5 Z M 1148.5 405.5 L 1179.5 405.5 L 1179.5 412.5 L 1148.5 412.5 Z M 1510.5 405.5 L 1540.5 405.5 L 1540.5 412.5 L 1510.5 412.5 Z M 1100.5 405.5 L 1131.5 405.5 L 1131.5 412.5 L 1100.5 412.5 Z M 1366.5 405.5 L 1397.5 405.5 L 1397.5 412.5 L 1366.5 412.5 Z M 835.5 405.5 L 865.5 405.5 L 865.5 412.5 L 835.5 412.5 Z M 1053.5 405.5 L 1083.5 405.5 L 1083.5 412.5 L 1053.5 412.5 Z M 213.5 405.5 L 242.5 405.5 L 242.5 412.5 L 213.5 412.5 Z M 379.5 405.5 L 408.5 405.5 L 408.5 412.5 L 379.5 412.5 Z M 260.5 405.5 L 290.5 405.5 L 290.5 412.5 L 260.5 412.5 Z M 308.5 405.5 L 337.5 405.5 L 337.5 412.5 L 308.5 412.5 Z M 739.5 405.5 L 770.5 405.5 L 770.5 412.5 L 739.5 412.5 Z M 1244.5 405.5 L 1274.5 405.5 L 1274.5 412.5 L 1244.5 412.5 Z M 1676.5 405.5 L 1705.5 405.5 L 1705.5 412.5 L 1676.5 412.5 Z M 1628.5 405.5 L 1659.5 405.5 L 1659.5 412.5 L 1628.5 412.5 Z M 1581.5 405.5 L 1611.5 405.5 L 1611.5 412.5 L 1581.5 412.5 Z M 1196.5 405.5 L 1227.5 405.5 L 1227.5 412.5 L 1196.5 412.5 Z M 522.5 405.5 L 552.5 405.5 L 552.5 412.5 L 522.5 412.5 Z M 1414.5 405.5 L 1445.5 405.5 L 1445.5 416.5 L 1414.5 416.5 Z M 1317.5 405.5 L 1349.5 405.5 L 1349.5 416.5 L 1317.5 416.5 Z M 473.5 405.5 L 504.5 405.5 L 504.5 416.5 L 473.5 416.5 Z M 570.5 405.5 L 602.5 405.5 L 602.5 416.5 L 570.5 416.5 Z M 308.5 412.5 L 337.5 412.5 L 337.5 431.5 L 308.5 431.5 Z M 1581.5 412.5 L 1611.5 412.5 L 1611.5 431.5 L 1581.5 431.5 Z M 1510.5 412.5 L 1540.5 412.5 L 1540.5 431.5 L 1510.5 431.5 Z M 739.5 412.5 L 770.5 412.5 L 770.5 431.5 L 739.5 431.5 Z M 1366.5 412.5 L 1397.5 412.5 L 1397.5 431.5 L 1366.5 431.5 Z M 1628.5 412.5 L 1659.5 412.5 L 1659.5 431.5 L 1628.5 431.5 Z M 787.5 412.5 L 818.5 412.5 L 818.5 431.5 L 787.5 431.5 Z M 835.5 412.5 L 865.5 412.5 L 865.5 431.5 L 835.5 431.5 Z M 1676.5 412.5 L 1705.5 412.5 L 1705.5 431.5 L 1676.5 431.5 Z M 1244.5 412.5 L 1274.5 412.5 L 1274.5 431.5 L 1244.5 431.5 Z M 522.5 412.5 L 552.5 412.5 L 552.5 431.5 L 522.5 431.5 Z M 379.5 412.5 L 408.5 412.5 L 408.5 431.5 L 379.5 431.5 Z M 1196.5 412.5 L 1227.5 412.5 L 1227.5 431.5 L 1196.5 431.5 Z M 1100.5 412.5 L 1131.5 412.5 L 1131.5 431.5 L 1100.5 431.5 Z M 1148.5 412.5 L 1179.5 412.5 L 1179.5 431.5 L 1148.5 431.5 Z M 260.5 412.5 L 290.5 412.5 L 290.5 431.5 L 260.5 431.5 Z M 644.5 412.5 L 674.5 412.5 L 674.5 431.5 L 644.5 431.5 Z M 1053.5 412.5 L 1083.5 412.5 L 1083.5 431.5 L 1053.5 431.5 Z M 213.5 412.5 L 242.5 412.5 L 242.5 431.5 L 213.5 431.5 Z M 691.5 412.5 L 722.5 412.5 L 722.5 431.5 L 691.5 431.5 Z M 570.5 416.5 L 602.5 416.5 L 602.5 436.5 L 570.5 436.5 Z M 1317.5 416.5 L 1349.5 416.5 L 1349.5 436.5 L 1317.5 436.5 Z M 1414.5 416.5 L 1445.5 416.5 L 1445.5 436.5 L 1414.5 436.5 Z M 473.5 416.5 L 504.5 416.5 L 504.5 436.5 L 473.5 436.5 Z M 260.5 431.5 L 290.5 431.5 L 290.5 451.5 L 260.5 451.5 Z M 787.5 431.5 L 818.5 431.5 L 818.5 451.5 L 787.5 451.5 Z M 1510.5 431.5 L 1540.5 431.5 L 1540.5 451.5 L 1510.5 451.5 Z M 835.5 431.5 L 865.5 431.5 L 865.5 451.5 L 835.5 451.5 Z M 1196.5 431.5 L 1227.5 431.5 L 1227.5 451.5 L 1196.5 451.5 Z M 1148.5 431.5 L 1179.5 431.5 L 1179.5 451.5 L 1148.5 451.5 Z M 522.5 431.5 L 552.5 431.5 L 552.5 451.5 L 522.5 451.5 Z M 691.5 431.5 L 722.5 431.5 L 722.5 451.5 L 691.5 451.5 Z M 1053.5 431.5 L 1083.5 431.5 L 1083.5 451.5 L 1053.5 451.5 Z M 1581.5 431.5 L 1611.5 431.5 L 1611.5 451.5 L 1581.5 451.5 Z M 308.5 431.5 L 337.5 431.5 L 337.5 451.5 L 308.5 451.5 Z M 1628.5 431.5 L 1659.5 431.5 L 1659.5 451.5 L 1628.5 451.5 Z M 379.5 431.5 L 408.5 431.5 L 408.5 451.5 L 379.5 451.5 Z M 1244.5 431.5 L 1274.5 431.5 L 1274.5 451.5 L 1244.5 451.5 Z M 1366.5 431.5 L 1397.5 431.5 L 1397.5 451.5 L 1366.5 451.5 Z M 213.5 431.5 L 242.5 431.5 L 242.5 451.5 L 213.5 451.5 Z M 1676.5 431.5 L 1705.5 431.5 L 1705.5 451.5 L 1676.5 451.5 Z M 644.5 431.5 L 674.5 431.5 L 674.5 451.5 L 644.5 451.5 Z M 739.5 431.5 L 770.5 431.5 L 770.5 451.5 L 739.5 451.5 Z M 1100.5 431.5 L 1131.5 431.5 L 1131.5 451.5 L 1100.5 451.5 Z M 1317.5 436.5 L 1349.5 436.5 L 1349.5 455.5 L 1317.5 455.5 Z M 570.5 436.5 L 602.5 436.5 L 602.5 455.5 L 570.5 455.5 Z M 1414.5 436.5 L 1445.5 436.5 L 1445.5 455.5 L 1414.5 455.5 Z M 473.5 436.5 L 504.5 436.5 L 504.5 455.5 L 473.5 455.5 Z M 425.5 405.5 L 456.5 405.5 L 456.5 455.5 L 425.5 455.5 Z M 1462.5 405.5 L 1493.5 405.5 L 1493.5 455.5 L 1462.5 455.5 Z M 1581.5 451.5 L 1611.5 451.5 L 1611.5 470.5 L 1581.5 470.5 Z M 1510.5 451.5 L 1540.5 451.5 L 1540.5 470.5 L 1510.5 470.5 Z M 739.5 451.5 L 770.5 451.5 L 770.5 470.5 L 739.5 470.5 Z M 787.5 451.5 L 818.5 451.5 L 818.5 470.5 L 787.5 470.5 Z M 835.5 451.5 L 865.5 451.5 L 865.5 470.5 L 835.5 470.5 Z M 1628.5 451.5 L 1659.5 451.5 L 1659.5 470.5 L 1628.5 470.5 Z M 1676.5 451.5 L 1705.5 451.5 L 1705.5 470.5 L 1676.5 470.5 Z M 1244.5 451.5 L 1274.5 451.5 L 1274.5 470.5 L 1244.5 470.5 Z M 1196.5 451.5 L 1227.5 451.5 L 1227.5 470.5 L 1196.5 470.5 Z M 1366.5 451.5 L 1397.5 451.5 L 1397.5 470.5 L 1366.5 470.5 Z M 308.5 451.5 L 337.5 451.5 L 337.5 470.5 L 308.5 470.5 Z M 260.5 451.5 L 290.5 451.5 L 290.5 470.5 L 260.5 470.5 Z M 522.5 451.5 L 552.5 451.5 L 552.5 470.5 L 522.5 470.5 Z M 379.5 451.5 L 408.5 451.5 L 408.5 470.5 L 379.5 470.5 Z M 1053.5 451.5 L 1083.5 451.5 L 1083.5 470.5 L 1053.5 470.5 Z M 1100.5 451.5 L 1131.5 451.5 L 1131.5 470.5 L 1100.5 470.5 Z M 1148.5 451.5 L 1179.5 451.5 L 1179.5 470.5 L 1148.5 470.5 Z M 644.5 451.5 L 674.5 451.5 L 674.5 470.5 L 644.5 470.5 Z M 213.5 451.5 L 242.5 451.5 L 242.5 470.5 L 213.5 470.5 Z M 691.5 451.5 L 722.5 451.5 L 722.5 470.5 L 691.5 470.5 Z M 1462.5 455.5 L 1493.5 455.5 L 1493.5 475.5 L 1462.5 475.5 Z M 425.5 455.5 L 456.5 455.5 L 456.5 475.5 L 425.5 475.5 Z M 473.5 455.5 L 504.5 455.5 L 504.5 475.5 L 473.5 475.5 Z M 1317.5 455.5 L 1349.5 455.5 L 1349.5 475.5 L 1317.5 475.5 Z M 570.5 455.5 L 602.5 455.5 L 602.5 475.5 L 570.5 475.5 Z M 1414.5 455.5 L 1445.5 455.5 L 1445.5 475.5 L 1414.5 475.5 Z M 1196.5 470.5 L 1227.5 470.5 L 1227.5 490.5 L 1196.5 490.5 Z M 213.5 470.5 L 242.5 470.5 L 242.5 490.5 L 213.5 490.5 Z M 1053.5 470.5 L 1083.5 470.5 L 1083.5 490.5 L 1053.5 490.5 Z M 787.5 470.5 L 818.5 470.5 L 818.5 490.5 L 787.5 490.5 Z M 260.5 470.5 L 290.5 470.5 L 290.5 490.5 L 260.5 490.5 Z M 691.5 470.5 L 722.5 470.5 L 722.5 490.5 L 691.5 490.5 Z M 308.5 470.5 L 337.5 470.5 L 337.5 490.5 L 308.5 490.5 Z M 1628.5 470.5 L 1659.5 470.5 L 1659.5 490.5 L 1628.5 490.5 Z M 1676.5 470.5 L 1705.5 470.5 L 1705.5 490.5 L 1676.5 490.5 Z M 1581.5 470.5 L 1611.5 470.5 L 1611.5 490.5 L 1581.5 490.5 Z M 835.5 470.5 L 865.5 470.5 L 865.5 490.5 L 835.5 490.5 Z M 1100.5 470.5 L 1131.5 470.5 L 1131.5 490.5 L 1100.5 490.5 Z M 473.5 475.5 L 504.5 475.5 L 504.5 494.5 L 473.5 494.5 Z M 570.5 475.5 L 602.5 475.5 L 602.5 494.5 L 570.5 494.5 Z M 1414.5 475.5 L 1445.5 475.5 L 1445.5 494.5 L 1414.5 494.5 Z M 425.5 475.5 L 456.5 475.5 L 456.5 494.5 L 425.5 494.5 Z M 1462.5 475.5 L 1493.5 475.5 L 1493.5 494.5 L 1462.5 494.5 Z M 1317.5 475.5 L 1349.5 475.5 L 1349.5 494.5 L 1317.5 494.5 Z M 1628.5 490.5 L 1659.5 490.5 L 1659.5 509.5 L 1628.5 509.5 Z M 835.5 490.5 L 865.5 490.5 L 865.5 509.5 L 835.5 509.5 Z M 308.5 490.5 L 337.5 490.5 L 337.5 509.5 L 308.5 509.5 Z M 1196.5 490.5 L 1227.5 490.5 L 1227.5 509.5 L 1196.5 509.5 Z M 1100.5 490.5 L 1131.5 490.5 L 1131.5 509.5 L 1100.5 509.5 Z M 1581.5 490.5 L 1611.5 490.5 L 1611.5 509.5 L 1581.5 509.5 Z M 1053.5 490.5 L 1083.5 490.5 L 1083.5 509.5 L 1053.5 509.5 Z M 213.5 490.5 L 242.5 490.5 L 242.5 509.5 L 213.5 509.5 Z M 260.5 490.5 L 290.5 490.5 L 290.5 509.5 L 260.5 509.5 Z M 691.5 490.5 L 722.5 490.5 L 722.5 509.5 L 691.5 509.5 Z M 1676.5 490.5 L 1705.5 490.5 L 1705.5 509.5 L 1676.5 509.5 Z M 787.5 490.5 L 818.5 490.5 L 818.5 509.5 L 787.5 509.5 Z M 1317.5 494.5 L 1349.5 494.5 L 1349.5 514.5 L 1317.5 514.5 Z M 1462.5 494.5 L 1493.5 494.5 L 1493.5 514.5 L 1462.5 514.5 Z M 1414.5 494.5 L 1445.5 494.5 L 1445.5 514.5 L 1414.5 514.5 Z M 570.5 494.5 L 602.5 494.5 L 602.5 514.5 L 570.5 514.5 Z M 473.5 494.5 L 504.5 494.5 L 504.5 514.5 L 473.5 514.5 Z M 425.5 494.5 L 456.5 494.5 L 456.5 514.5 L 425.5 514.5 Z M 1148.5 470.5 L 1179.5 470.5 L 1179.5 519.5 L 1148.5 519.5 Z M 379.5 470.5 L 408.5 470.5 L 408.5 519.5 L 379.5 519.5 Z M 1244.5 470.5 L 1274.5 470.5 L 1274.5 519.5 L 1244.5 519.5 Z M 1510.5 470.5 L 1540.5 470.5 L 1540.5 519.5 L 1510.5 519.5 Z M 644.5 470.5 L 674.5 470.5 L 674.5 519.5 L 644.5 519.5 Z M 425.5 514.5 L 456.5 514.5 L 456.5 519.5 L 425.5 519.5 Z M 691.5 509.5 L 722.5 509.5 L 722.5 519.5 L 691.5 519.5 Z M 570.5 514.5 L 602.5 514.5 L 602.5 519.5 L 570.5 519.5 Z M 213.5 509.5 L 242.5 509.5 L 242.5 519.5 L 213.5 519.5 Z M 308.5 509.5 L 337.5 509.5 L 337.5 519.5 L 308.5 519.5 Z M 1317.5 514.5 L 1349.5 514.5 L 1349.5 519.5 L 1317.5 519.5 Z M 1100.5 509.5 L 1131.5 509.5 L 1131.5 519.5 L 1100.5 519.5 Z M 835.5 509.5 L 865.5 509.5 L 865.5 519.5 L 835.5 519.5 Z M 787.5 509.5 L 818.5 509.5 L 818.5 519.5 L 787.5 519.5 Z M 1628.5 509.5 L 1659.5 509.5 L 1659.5 519.5 L 1628.5 519.5 Z M 1581.5 509.5 L 1611.5 509.5 L 1611.5 519.5 L 1581.5 519.5 Z M 1676.5 509.5 L 1705.5 509.5 L 1705.5 519.5 L 1676.5 519.5 Z M 473.5 514.5 L 504.5 514.5 L 504.5 519.5 L 473.5 519.5 Z M 1053.5 509.5 L 1083.5 509.5 L 1083.5 519.5 L 1053.5 519.5 Z M 1414.5 514.5 L 1445.5 514.5 L 1445.5 519.5 L 1414.5 519.5 Z M 522.5 470.5 L 552.5 470.5 L 552.5 519.5 L 522.5 519.5 Z M 739.5 470.5 L 770.5 470.5 L 770.5 519.5 L 739.5 519.5 Z M 1366.5 470.5 L 1397.5 470.5 L 1397.5 519.5 L 1366.5 519.5 Z M 1462.5 514.5 L 1493.5 514.5 L 1493.5 519.5 L 1462.5 519.5 Z M 1196.5 509.5 L 1227.5 509.5 L 1227.5 519.5 L 1196.5 519.5 Z M 260.5 509.5 L 290.5 509.5 L 290.5 519.5 L 260.5 519.5 Z M 260.5 509.5 "/>
 </clipPath>
 <clipPath id="clip9">
-  <path d="M 217 466 L 376.5 466 L 376.5 485 L 217 485 Z M 217 466 "/>
+  <path d="M 674.5 588.5 L 691.5 588.5 L 691.5 662.5 L 674.5 662.5 Z M 1611.5 588.5 L 1628.5 588.5 L 1628.5 662.5 L 1611.5 662.5 Z M 1659.5 588.5 L 1676.5 588.5 L 1676.5 662.5 L 1659.5 662.5 Z M 290.5 588.5 L 308.5 588.5 L 308.5 662.5 L 290.5 662.5 Z M 242.5 588.5 L 260.5 588.5 L 260.5 662.5 L 242.5 662.5 Z M 1349.5 588.5 L 1366.5 588.5 L 1366.5 662.5 L 1349.5 662.5 Z M 1397.5 588.5 L 1414.5 588.5 L 1414.5 662.5 L 1397.5 662.5 Z M 1445.5 588.5 L 1462.5 588.5 L 1462.5 662.5 L 1445.5 662.5 Z M 1493.5 588.5 L 1510.5 588.5 L 1510.5 662.5 L 1493.5 662.5 Z M 552.5 588.5 L 570.5 588.5 L 570.5 662.5 L 552.5 662.5 Z M 504.5 588.5 L 522.5 588.5 L 522.5 662.5 L 504.5 662.5 Z M 456.5 588.5 L 473.5 588.5 L 473.5 662.5 L 456.5 662.5 Z M 408.5 588.5 L 425.5 588.5 L 425.5 662.5 L 408.5 662.5 Z M 1083.5 588.5 L 1100.5 588.5 L 1100.5 662.5 L 1083.5 662.5 Z M 1131.5 588.5 L 1148.5 588.5 L 1148.5 662.5 L 1131.5 662.5 Z M 1179.5 588.5 L 1196.5 588.5 L 1196.5 662.5 L 1179.5 662.5 Z M 1227.5 588.5 L 1244.5 588.5 L 1244.5 662.5 L 1227.5 662.5 Z M 818.5 588.5 L 835.5 588.5 L 835.5 662.5 L 818.5 662.5 Z M 770.5 588.5 L 787.5 588.5 L 787.5 662.5 L 770.5 662.5 Z M 722.5 588.5 L 739.5 588.5 L 739.5 662.5 L 722.5 662.5 Z M 722.5 588.5 "/>
 </clipPath>
+<image id="image859" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image859"/>
+</pattern>
+<mask id="mask4">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
+</mask>
 <clipPath id="clip10">
-  <path d="M 174.5 595 L 290 595 L 290 606 L 174.5 606 Z M 174.5 595 "/>
+  <path d="M 674.5 405.5 L 691.5 405.5 L 691.5 519.5 L 674.5 519.5 Z M 1611.5 405.5 L 1628.5 405.5 L 1628.5 519.5 L 1611.5 519.5 Z M 1659.5 405.5 L 1676.5 405.5 L 1676.5 519.5 L 1659.5 519.5 Z M 290.5 405.5 L 308.5 405.5 L 308.5 519.5 L 290.5 519.5 Z M 242.5 405.5 L 260.5 405.5 L 260.5 519.5 L 242.5 519.5 Z M 1349.5 405.5 L 1366.5 405.5 L 1366.5 519.5 L 1349.5 519.5 Z M 1397.5 405.5 L 1414.5 405.5 L 1414.5 519.5 L 1397.5 519.5 Z M 1445.5 405.5 L 1462.5 405.5 L 1462.5 519.5 L 1445.5 519.5 Z M 1493.5 405.5 L 1510.5 405.5 L 1510.5 519.5 L 1493.5 519.5 Z M 552.5 405.5 L 570.5 405.5 L 570.5 519.5 L 552.5 519.5 Z M 504.5 405.5 L 522.5 405.5 L 522.5 519.5 L 504.5 519.5 Z M 456.5 405.5 L 473.5 405.5 L 473.5 519.5 L 456.5 519.5 Z M 408.5 405.5 L 425.5 405.5 L 425.5 519.5 L 408.5 519.5 Z M 1083.5 405.5 L 1100.5 405.5 L 1100.5 519.5 L 1083.5 519.5 Z M 1131.5 405.5 L 1148.5 405.5 L 1148.5 519.5 L 1131.5 519.5 Z M 1179.5 405.5 L 1196.5 405.5 L 1196.5 519.5 L 1179.5 519.5 Z M 1227.5 405.5 L 1244.5 405.5 L 1244.5 519.5 L 1227.5 519.5 Z M 818.5 405.5 L 835.5 405.5 L 835.5 519.5 L 818.5 519.5 Z M 770.5 405.5 L 787.5 405.5 L 787.5 519.5 L 770.5 519.5 Z M 722.5 405.5 L 739.5 405.5 L 739.5 519.5 L 722.5 519.5 Z M 722.5 405.5 "/>
 </clipPath>
+<image id="image860" 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="#image860"/>
+</pattern>
+<mask id="mask5">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
+</mask>
 <clipPath id="clip11">
-  <path d="M 1370 466 L 1586.5 466 L 1586.5 485 L 1370 485 Z M 1370 466 "/>
+  <path d="M 971.5 551.5 L 1026.5 551.5 L 1026.5 557.5 L 971.5 557.5 Z M 892.5 551.5 L 947.5 551.5 L 947.5 557.5 L 892.5 557.5 Z M 892.5 551.5 "/>
 </clipPath>
+<pattern id="pattern6" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image859"/>
+</pattern>
+<mask id="mask6">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern6);stroke:none;"/>
+</mask>
 <clipPath id="clip12">
-  <path d="M 858.5 473 L 973 473 L 973 484 L 858.5 484 Z M 858.5 473 "/>
+  <path d="M 1638.5 543.5 L 1657.5 543.5 L 1657.5 563.5 L 1638.5 563.5 Z M 261.5 543.5 L 280.5 543.5 L 280.5 563.5 L 261.5 563.5 Z M 320.5 543.5 L 340.5 543.5 L 340.5 563.5 L 320.5 563.5 Z M 376.5 543.5 L 395.5 543.5 L 395.5 563.5 L 376.5 563.5 Z M 436.5 543.5 L 456.5 543.5 L 456.5 563.5 L 436.5 563.5 Z M 535.5 543.5 L 554.5 543.5 L 554.5 563.5 L 535.5 563.5 Z M 633.5 543.5 L 652.5 543.5 L 652.5 563.5 L 633.5 563.5 Z M 742.5 543.5 L 762.5 543.5 L 762.5 563.5 L 742.5 563.5 Z M 849.5 543.5 L 868.5 543.5 L 868.5 563.5 L 849.5 563.5 Z M 970.5 543.5 L 989.5 543.5 L 989.5 563.5 L 970.5 563.5 Z M 1068.5 543.5 L 1088.5 543.5 L 1088.5 563.5 L 1068.5 563.5 Z M 1167.5 543.5 L 1186.5 543.5 L 1186.5 563.5 L 1167.5 563.5 Z M 1265.5 543.5 L 1285.5 543.5 L 1285.5 563.5 L 1265.5 563.5 Z M 1363.5 543.5 L 1383.5 543.5 L 1383.5 563.5 L 1363.5 563.5 Z M 1462.5 543.5 L 1481.5 543.5 L 1481.5 563.5 L 1462.5 563.5 Z M 1524.5 543.5 L 1543.5 543.5 L 1543.5 563.5 L 1524.5 563.5 Z M 1579.5 543.5 L 1599.5 543.5 L 1599.5 563.5 L 1579.5 563.5 Z M 1579.5 543.5 "/>
 </clipPath>
 <clipPath id="clip13">
-  <path d="M 890 588 L 1060.5 588 L 1060.5 607 L 890 607 Z M 890 588 "/>
+  <path d="M 196.5 368.5 L 1722.5 368.5 L 1722.5 388.5 L 196.5 388.5 Z M 639.5 388.5 L 668.5 388.5 L 668.5 412.5 L 639.5 412.5 Z M 518.5 388.5 L 556.5 388.5 L 556.5 412.5 L 518.5 412.5 Z M 912.5 388.5 L 949.5 388.5 L 949.5 412.5 L 912.5 412.5 Z M 1250.5 388.5 L 1279.5 388.5 L 1279.5 412.5 L 1250.5 412.5 Z M 783.5 407.5 L 821.5 407.5 L 821.5 412.5 L 783.5 412.5 Z M 1193.5 407.5 L 1231.5 407.5 L 1231.5 412.5 L 1193.5 412.5 Z M 1681.5 388.5 L 1705.5 388.5 L 1705.5 412.5 L 1681.5 412.5 Z M 1097.5 407.5 L 1135.5 407.5 L 1135.5 412.5 L 1097.5 412.5 Z M 368.5 407.5 L 499.5 407.5 L 499.5 412.5 L 368.5 412.5 Z M 213.5 388.5 L 237.5 388.5 L 237.5 412.5 L 213.5 412.5 Z M 1048.5 388.5 L 1077.5 388.5 L 1077.5 412.5 L 1048.5 412.5 Z M 1420.5 407.5 L 1550.5 407.5 L 1550.5 412.5 L 1420.5 412.5 Z M 313.5 388.5 L 340.5 388.5 L 340.5 412.5 L 313.5 412.5 Z M 256.5 407.5 L 294.5 407.5 L 294.5 412.5 L 256.5 412.5 Z M 1154.5 388.5 L 1174.5 388.5 L 1174.5 412.5 L 1154.5 412.5 Z M 1579.5 388.5 L 1605.5 388.5 L 1605.5 412.5 L 1579.5 412.5 Z M 841.5 388.5 L 870.5 388.5 L 870.5 412.5 L 841.5 412.5 Z M 1624.5 407.5 L 1662.5 407.5 L 1662.5 412.5 L 1624.5 412.5 Z M 745.5 388.5 L 764.5 388.5 L 764.5 412.5 L 745.5 412.5 Z M 1362.5 388.5 L 1400.5 388.5 L 1400.5 412.5 L 1362.5 412.5 Z M 969.5 407.5 L 1028.5 407.5 L 1028.5 412.5 L 969.5 412.5 Z M 687.5 407.5 L 725.5 407.5 L 725.5 412.5 L 687.5 412.5 Z M 575.5 407.5 L 607.5 407.5 L 607.5 416.5 L 575.5 416.5 Z M 1311.5 407.5 L 1343.5 407.5 L 1343.5 416.5 L 1311.5 416.5 Z M 1420.5 412.5 L 1550.5 412.5 L 1550.5 416.5 L 1420.5 416.5 Z M 368.5 412.5 L 499.5 412.5 L 499.5 427.5 L 368.5 427.5 Z M 1420.5 416.5 L 1550.5 416.5 L 1550.5 427.5 L 1420.5 427.5 Z M 1681.5 412.5 L 1705.5 412.5 L 1705.5 431.5 L 1681.5 431.5 Z M 687.5 412.5 L 725.5 412.5 L 725.5 431.5 L 687.5 431.5 Z M 783.5 412.5 L 821.5 412.5 L 821.5 431.5 L 783.5 431.5 Z M 1579.5 412.5 L 1605.5 412.5 L 1605.5 431.5 L 1579.5 431.5 Z M 1624.5 412.5 L 1662.5 412.5 L 1662.5 431.5 L 1624.5 431.5 Z M 745.5 412.5 L 764.5 412.5 L 764.5 431.5 L 745.5 431.5 Z M 841.5 412.5 L 870.5 412.5 L 870.5 431.5 L 841.5 431.5 Z M 313.5 412.5 L 340.5 412.5 L 340.5 431.5 L 313.5 431.5 Z M 256.5 412.5 L 294.5 412.5 L 294.5 431.5 L 256.5 431.5 Z M 518.5 412.5 L 556.5 412.5 L 556.5 431.5 L 518.5 431.5 Z M 368.5 427.5 L 403.5 427.5 L 403.5 431.5 L 368.5 431.5 Z M 1193.5 412.5 L 1231.5 412.5 L 1231.5 431.5 L 1193.5 431.5 Z M 1097.5 412.5 L 1135.5 412.5 L 1135.5 431.5 L 1097.5 431.5 Z M 1048.5 412.5 L 1077.5 412.5 L 1077.5 431.5 L 1048.5 431.5 Z M 213.5 412.5 L 237.5 412.5 L 237.5 431.5 L 213.5 431.5 Z M 1250.5 412.5 L 1279.5 412.5 L 1279.5 431.5 L 1250.5 431.5 Z M 1154.5 412.5 L 1174.5 412.5 L 1174.5 431.5 L 1154.5 431.5 Z M 1362.5 412.5 L 1400.5 412.5 L 1400.5 431.5 L 1362.5 431.5 Z M 1516.5 427.5 L 1550.5 427.5 L 1550.5 431.5 L 1516.5 431.5 Z M 639.5 412.5 L 668.5 412.5 L 668.5 431.5 L 639.5 431.5 Z M 969.5 412.5 L 1028.5 412.5 L 1028.5 432.5 L 969.5 432.5 Z M 912.5 412.5 L 949.5 412.5 L 949.5 432.5 L 912.5 432.5 Z M 479.5 427.5 L 499.5 427.5 L 499.5 436.5 L 479.5 436.5 Z M 1311.5 416.5 L 1343.5 416.5 L 1343.5 436.5 L 1311.5 436.5 Z M 575.5 416.5 L 607.5 416.5 L 607.5 436.5 L 575.5 436.5 Z M 1420.5 427.5 L 1439.5 427.5 L 1439.5 436.5 L 1420.5 436.5 Z M 783.5 431.5 L 821.5 431.5 L 821.5 451.5 L 783.5 451.5 Z M 368.5 431.5 L 403.5 431.5 L 403.5 451.5 L 368.5 451.5 Z M 1579.5 431.5 L 1605.5 431.5 L 1605.5 451.5 L 1579.5 451.5 Z M 1154.5 431.5 L 1174.5 431.5 L 1174.5 451.5 L 1154.5 451.5 Z M 313.5 431.5 L 340.5 431.5 L 340.5 451.5 L 313.5 451.5 Z M 1097.5 431.5 L 1135.5 431.5 L 1135.5 451.5 L 1097.5 451.5 Z M 1516.5 431.5 L 1550.5 431.5 L 1550.5 451.5 L 1516.5 451.5 Z M 1048.5 431.5 L 1077.5 431.5 L 1077.5 451.5 L 1048.5 451.5 Z M 639.5 431.5 L 668.5 431.5 L 668.5 451.5 L 639.5 451.5 Z M 841.5 431.5 L 870.5 431.5 L 870.5 451.5 L 841.5 451.5 Z M 687.5 431.5 L 725.5 431.5 L 725.5 451.5 L 687.5 451.5 Z M 969.5 432.5 L 1028.5 432.5 L 1028.5 451.5 L 969.5 451.5 Z M 912.5 432.5 L 949.5 432.5 L 949.5 451.5 L 912.5 451.5 Z M 256.5 431.5 L 294.5 431.5 L 294.5 451.5 L 256.5 451.5 Z M 518.5 431.5 L 556.5 431.5 L 556.5 451.5 L 518.5 451.5 Z M 1193.5 431.5 L 1231.5 431.5 L 1231.5 451.5 L 1193.5 451.5 Z M 213.5 431.5 L 237.5 431.5 L 237.5 451.5 L 213.5 451.5 Z M 1250.5 431.5 L 1279.5 431.5 L 1279.5 451.5 L 1250.5 451.5 Z M 745.5 431.5 L 764.5 431.5 L 764.5 451.5 L 745.5 451.5 Z M 1362.5 431.5 L 1400.5 431.5 L 1400.5 451.5 L 1362.5 451.5 Z M 1681.5 431.5 L 1705.5 431.5 L 1705.5 451.5 L 1681.5 451.5 Z M 1624.5 431.5 L 1662.5 431.5 L 1662.5 451.5 L 1624.5 451.5 Z M 1420.5 436.5 L 1439.5 436.5 L 1439.5 455.5 L 1420.5 455.5 Z M 1311.5 436.5 L 1343.5 436.5 L 1343.5 455.5 L 1311.5 455.5 Z M 575.5 436.5 L 607.5 436.5 L 607.5 455.5 L 575.5 455.5 Z M 479.5 436.5 L 499.5 436.5 L 499.5 455.5 L 479.5 455.5 Z M 422.5 446.5 L 460.5 446.5 L 460.5 455.5 L 422.5 455.5 Z M 1458.5 446.5 L 1496.5 446.5 L 1496.5 455.5 L 1458.5 455.5 Z M 1362.5 451.5 L 1400.5 451.5 L 1400.5 470.5 L 1362.5 470.5 Z M 1516.5 451.5 L 1550.5 451.5 L 1550.5 470.5 L 1516.5 470.5 Z M 256.5 451.5 L 294.5 451.5 L 294.5 470.5 L 256.5 470.5 Z M 639.5 451.5 L 668.5 451.5 L 668.5 470.5 L 639.5 470.5 Z M 1624.5 451.5 L 1662.5 451.5 L 1662.5 470.5 L 1624.5 470.5 Z M 1681.5 451.5 L 1705.5 451.5 L 1705.5 470.5 L 1681.5 470.5 Z M 687.5 451.5 L 725.5 451.5 L 725.5 470.5 L 687.5 470.5 Z M 1579.5 451.5 L 1605.5 451.5 L 1605.5 470.5 L 1579.5 470.5 Z M 783.5 451.5 L 821.5 451.5 L 821.5 470.5 L 783.5 470.5 Z M 313.5 451.5 L 340.5 451.5 L 340.5 470.5 L 313.5 470.5 Z M 745.5 451.5 L 764.5 451.5 L 764.5 470.5 L 745.5 470.5 Z M 841.5 451.5 L 870.5 451.5 L 870.5 470.5 L 841.5 470.5 Z M 213.5 451.5 L 237.5 451.5 L 237.5 470.5 L 213.5 470.5 Z M 1193.5 451.5 L 1231.5 451.5 L 1231.5 470.5 L 1193.5 470.5 Z M 1097.5 451.5 L 1135.5 451.5 L 1135.5 470.5 L 1097.5 470.5 Z M 1048.5 451.5 L 1077.5 451.5 L 1077.5 470.5 L 1048.5 470.5 Z M 1250.5 451.5 L 1279.5 451.5 L 1279.5 470.5 L 1250.5 470.5 Z M 1154.5 451.5 L 1174.5 451.5 L 1174.5 470.5 L 1154.5 470.5 Z M 368.5 451.5 L 403.5 451.5 L 403.5 470.5 L 368.5 470.5 Z M 518.5 451.5 L 556.5 451.5 L 556.5 470.5 L 518.5 470.5 Z M 969.5 451.5 L 1028.5 451.5 L 1028.5 471.5 L 969.5 471.5 Z M 912.5 451.5 L 949.5 451.5 L 949.5 471.5 L 912.5 471.5 Z M 575.5 455.5 L 607.5 455.5 L 607.5 475.5 L 575.5 475.5 Z M 1311.5 455.5 L 1343.5 455.5 L 1343.5 475.5 L 1311.5 475.5 Z M 422.5 455.5 L 460.5 455.5 L 460.5 475.5 L 422.5 475.5 Z M 1458.5 455.5 L 1496.5 455.5 L 1496.5 475.5 L 1458.5 475.5 Z M 1420.5 455.5 L 1439.5 455.5 L 1439.5 475.5 L 1420.5 475.5 Z M 479.5 455.5 L 499.5 455.5 L 499.5 475.5 L 479.5 475.5 Z M 639.5 470.5 L 668.5 470.5 L 668.5 479.5 L 639.5 479.5 Z M 745.5 470.5 L 764.5 470.5 L 764.5 479.5 L 745.5 479.5 Z M 1250.5 470.5 L 1279.5 470.5 L 1279.5 479.5 L 1250.5 479.5 Z M 1516.5 470.5 L 1550.5 470.5 L 1550.5 479.5 L 1516.5 479.5 Z M 1154.5 470.5 L 1174.5 470.5 L 1174.5 479.5 L 1154.5 479.5 Z M 518.5 470.5 L 556.5 470.5 L 556.5 479.5 L 518.5 479.5 Z M 368.5 470.5 L 403.5 470.5 L 403.5 479.5 L 368.5 479.5 Z M 1362.5 470.5 L 1400.5 470.5 L 1400.5 479.5 L 1362.5 479.5 Z M 1681.5 470.5 L 1705.5 470.5 L 1705.5 490.5 L 1681.5 490.5 Z M 1624.5 470.5 L 1662.5 470.5 L 1662.5 490.5 L 1624.5 490.5 Z M 1193.5 470.5 L 1231.5 470.5 L 1231.5 490.5 L 1193.5 490.5 Z M 256.5 470.5 L 294.5 470.5 L 294.5 490.5 L 256.5 490.5 Z M 841.5 470.5 L 870.5 470.5 L 870.5 490.5 L 841.5 490.5 Z M 687.5 470.5 L 725.5 470.5 L 725.5 490.5 L 687.5 490.5 Z M 1097.5 470.5 L 1135.5 470.5 L 1135.5 490.5 L 1097.5 490.5 Z M 1048.5 470.5 L 1077.5 470.5 L 1077.5 490.5 L 1048.5 490.5 Z M 313.5 470.5 L 340.5 470.5 L 340.5 490.5 L 313.5 490.5 Z M 1579.5 470.5 L 1605.5 470.5 L 1605.5 490.5 L 1579.5 490.5 Z M 213.5 470.5 L 237.5 470.5 L 237.5 490.5 L 213.5 490.5 Z M 783.5 470.5 L 821.5 470.5 L 821.5 490.5 L 783.5 490.5 Z M 1458.5 475.5 L 1496.5 475.5 L 1496.5 494.5 L 1458.5 494.5 Z M 479.5 475.5 L 499.5 475.5 L 499.5 494.5 L 479.5 494.5 Z M 1420.5 475.5 L 1439.5 475.5 L 1439.5 494.5 L 1420.5 494.5 Z M 1311.5 475.5 L 1343.5 475.5 L 1343.5 494.5 L 1311.5 494.5 Z M 422.5 475.5 L 460.5 475.5 L 460.5 494.5 L 422.5 494.5 Z M 575.5 475.5 L 607.5 475.5 L 607.5 494.5 L 575.5 494.5 Z M 422.5 494.5 L 460.5 494.5 L 460.5 499.5 L 422.5 499.5 Z M 687.5 490.5 L 725.5 490.5 L 725.5 499.5 L 687.5 499.5 Z M 783.5 490.5 L 821.5 490.5 L 821.5 499.5 L 783.5 499.5 Z M 1193.5 490.5 L 1231.5 490.5 L 1231.5 499.5 L 1193.5 499.5 Z M 575.5 494.5 L 607.5 494.5 L 607.5 499.5 L 575.5 499.5 Z M 479.5 494.5 L 499.5 494.5 L 499.5 499.5 L 479.5 499.5 Z M 1097.5 490.5 L 1135.5 490.5 L 1135.5 499.5 L 1097.5 499.5 Z M 1420.5 494.5 L 1439.5 494.5 L 1439.5 499.5 L 1420.5 499.5 Z M 1311.5 494.5 L 1343.5 494.5 L 1343.5 499.5 L 1311.5 499.5 Z M 1458.5 494.5 L 1496.5 494.5 L 1496.5 499.5 L 1458.5 499.5 Z M 1579.5 490.5 L 1605.5 490.5 L 1605.5 509.5 L 1579.5 509.5 Z M 1097.5 499.5 L 1291.5 499.5 L 1291.5 509.5 L 1097.5 509.5 Z M 1048.5 490.5 L 1077.5 490.5 L 1077.5 509.5 L 1048.5 509.5 Z M 213.5 490.5 L 237.5 490.5 L 237.5 509.5 L 213.5 509.5 Z M 256.5 490.5 L 294.5 490.5 L 294.5 509.5 L 256.5 509.5 Z M 1681.5 490.5 L 1705.5 490.5 L 1705.5 509.5 L 1681.5 509.5 Z M 627.5 499.5 L 821.5 499.5 L 821.5 509.5 L 627.5 509.5 Z M 1624.5 490.5 L 1662.5 490.5 L 1662.5 509.5 L 1624.5 509.5 Z M 841.5 490.5 L 870.5 490.5 L 870.5 509.5 L 841.5 509.5 Z M 313.5 490.5 L 340.5 490.5 L 340.5 509.5 L 313.5 509.5 Z M 373.5 499.5 L 460.5 499.5 L 460.5 514.5 L 373.5 514.5 Z M 1458.5 499.5 L 1545.5 499.5 L 1545.5 514.5 L 1458.5 514.5 Z M 1311.5 499.5 L 1439.5 499.5 L 1439.5 514.5 L 1311.5 514.5 Z M 479.5 499.5 L 607.5 499.5 L 607.5 514.5 L 479.5 514.5 Z M 1097.5 509.5 L 1291.5 509.5 L 1291.5 518.5 L 1097.5 518.5 Z M 313.5 509.5 L 340.5 509.5 L 340.5 518.5 L 313.5 518.5 Z M 1048.5 509.5 L 1077.5 509.5 L 1077.5 518.5 L 1048.5 518.5 Z M 841.5 509.5 L 870.5 509.5 L 870.5 518.5 L 841.5 518.5 Z M 627.5 509.5 L 821.5 509.5 L 821.5 518.5 L 627.5 518.5 Z M 1579.5 509.5 L 1605.5 509.5 L 1605.5 518.5 L 1579.5 518.5 Z M 213.5 509.5 L 237.5 509.5 L 237.5 518.5 L 213.5 518.5 Z M 1681.5 509.5 L 1705.5 509.5 L 1705.5 518.5 L 1681.5 518.5 Z M 256.5 509.5 L 294.5 509.5 L 294.5 519.5 L 256.5 519.5 Z M 1624.5 509.5 L 1662.5 509.5 L 1662.5 519.5 L 1624.5 519.5 Z M 1311.5 514.5 L 1439.5 514.5 L 1439.5 523.5 L 1311.5 523.5 Z M 479.5 514.5 L 607.5 514.5 L 607.5 523.5 L 479.5 523.5 Z M 373.5 514.5 L 460.5 514.5 L 460.5 524.5 L 373.5 524.5 Z M 1458.5 514.5 L 1545.5 514.5 L 1545.5 524.5 L 1458.5 524.5 Z M 678.5 538.5 L 764.5 538.5 L 764.5 547.5 L 678.5 547.5 Z M 783.5 538.5 L 870.5 538.5 L 870.5 547.5 L 783.5 547.5 Z M 524.5 543.5 L 607.5 543.5 L 607.5 547.5 L 524.5 547.5 Z M 1413.5 543.5 L 1501.5 543.5 L 1501.5 547.5 L 1413.5 547.5 Z M 1311.5 543.5 L 1394.5 543.5 L 1394.5 547.5 L 1311.5 547.5 Z M 1154.5 538.5 L 1240.5 538.5 L 1240.5 547.5 L 1154.5 547.5 Z M 1048.5 538.5 L 1135.5 538.5 L 1135.5 547.5 L 1048.5 547.5 Z M 304.5 538.5 L 342.5 538.5 L 342.5 547.5 L 304.5 547.5 Z M 1576.5 538.5 L 1614.5 538.5 L 1614.5 547.5 L 1576.5 547.5 Z M 417.5 543.5 L 505.5 543.5 L 505.5 547.5 L 417.5 547.5 Z M 1413.5 547.5 L 1501.5 547.5 L 1501.5 566.5 L 1413.5 566.5 Z M 524.5 547.5 L 607.5 547.5 L 607.5 566.5 L 524.5 566.5 Z M 417.5 547.5 L 505.5 547.5 L 505.5 566.5 L 417.5 566.5 Z M 1576.5 547.5 L 1614.5 547.5 L 1614.5 566.5 L 1576.5 566.5 Z M 678.5 547.5 L 764.5 547.5 L 764.5 566.5 L 678.5 566.5 Z M 783.5 547.5 L 870.5 547.5 L 870.5 566.5 L 783.5 566.5 Z M 1311.5 547.5 L 1394.5 547.5 L 1394.5 566.5 L 1311.5 566.5 Z M 304.5 547.5 L 342.5 547.5 L 342.5 566.5 L 304.5 566.5 Z M 1048.5 547.5 L 1135.5 547.5 L 1135.5 566.5 L 1048.5 566.5 Z M 1154.5 547.5 L 1240.5 547.5 L 1240.5 566.5 L 1154.5 566.5 Z M 969.5 471.5 L 1028.5 471.5 L 1028.5 585.5 L 969.5 585.5 Z M 1259.5 518.5 L 1291.5 518.5 L 1291.5 586.5 L 1259.5 586.5 Z M 1521.5 524.5 L 1545.5 524.5 L 1545.5 586.5 L 1521.5 586.5 Z M 627.5 518.5 L 659.5 518.5 L 659.5 586.5 L 627.5 586.5 Z M 373.5 524.5 L 397.5 524.5 L 397.5 586.5 L 373.5 586.5 Z M 1633.5 519.5 L 1662.5 519.5 L 1662.5 588.5 L 1633.5 588.5 Z M 256.5 519.5 L 285.5 519.5 L 285.5 588.5 L 256.5 588.5 Z M 256.5 588.5 L 294.5 588.5 L 294.5 595.5 L 256.5 595.5 Z M 213.5 586.5 L 237.5 586.5 L 237.5 595.5 L 213.5 595.5 Z M 1681.5 586.5 L 1705.5 586.5 L 1705.5 595.5 L 1681.5 595.5 Z M 627.5 586.5 L 725.5 586.5 L 725.5 595.5 L 627.5 595.5 Z M 1193.5 586.5 L 1291.5 586.5 L 1291.5 595.5 L 1193.5 595.5 Z M 1579.5 586.5 L 1605.5 586.5 L 1605.5 595.5 L 1579.5 595.5 Z M 1624.5 588.5 L 1662.5 588.5 L 1662.5 595.5 L 1624.5 595.5 Z M 313.5 586.5 L 340.5 586.5 L 340.5 595.5 L 313.5 595.5 Z M 373.5 586.5 L 556.5 586.5 L 556.5 596.5 L 373.5 596.5 Z M 575.5 586.5 L 607.5 586.5 L 607.5 596.5 L 575.5 596.5 Z M 1362.5 586.5 L 1545.5 586.5 L 1545.5 596.5 L 1362.5 596.5 Z M 1311.5 586.5 L 1343.5 586.5 L 1343.5 596.5 L 1311.5 596.5 Z M 745.5 588.5 L 870.5 588.5 L 870.5 597.5 L 745.5 597.5 Z M 1048.5 588.5 L 1174.5 588.5 L 1174.5 597.5 L 1048.5 597.5 Z M 890.5 490.5 L 949.5 490.5 L 949.5 602.5 L 890.5 602.5 Z M 373.5 596.5 L 556.5 596.5 L 556.5 605.5 L 373.5 605.5 Z M 1362.5 596.5 L 1545.5 596.5 L 1545.5 605.5 L 1362.5 605.5 Z M 422.5 605.5 L 556.5 605.5 L 556.5 606.5 L 422.5 606.5 Z M 1362.5 605.5 L 1496.5 605.5 L 1496.5 606.5 L 1362.5 606.5 Z M 745.5 597.5 L 870.5 597.5 L 870.5 608.5 L 745.5 608.5 Z M 1048.5 597.5 L 1174.5 597.5 L 1174.5 608.5 L 1048.5 608.5 Z M 1681.5 595.5 L 1705.5 595.5 L 1705.5 614.5 L 1681.5 614.5 Z M 627.5 595.5 L 725.5 595.5 L 725.5 614.5 L 627.5 614.5 Z M 313.5 595.5 L 340.5 595.5 L 340.5 614.5 L 313.5 614.5 Z M 1193.5 595.5 L 1291.5 595.5 L 1291.5 614.5 L 1193.5 614.5 Z M 1579.5 595.5 L 1605.5 595.5 L 1605.5 614.5 L 1579.5 614.5 Z M 1624.5 595.5 L 1662.5 595.5 L 1662.5 614.5 L 1624.5 614.5 Z M 213.5 595.5 L 237.5 595.5 L 237.5 614.5 L 213.5 614.5 Z M 256.5 595.5 L 294.5 595.5 L 294.5 614.5 L 256.5 614.5 Z M 422.5 606.5 L 460.5 606.5 L 460.5 616.5 L 422.5 616.5 Z M 575.5 596.5 L 607.5 596.5 L 607.5 616.5 L 575.5 616.5 Z M 1362.5 606.5 L 1400.5 606.5 L 1400.5 616.5 L 1362.5 616.5 Z M 1458.5 606.5 L 1496.5 606.5 L 1496.5 616.5 L 1458.5 616.5 Z M 518.5 606.5 L 556.5 606.5 L 556.5 616.5 L 518.5 616.5 Z M 1311.5 596.5 L 1343.5 596.5 L 1343.5 616.5 L 1311.5 616.5 Z M 1145.5 608.5 L 1174.5 608.5 L 1174.5 617.5 L 1145.5 617.5 Z M 745.5 608.5 L 773.5 608.5 L 773.5 617.5 L 745.5 617.5 Z M 832.5 608.5 L 870.5 608.5 L 870.5 617.5 L 832.5 617.5 Z M 1048.5 608.5 L 1087.5 608.5 L 1087.5 617.5 L 1048.5 617.5 Z M 890.5 602.5 L 949.5 602.5 L 949.5 621.5 L 890.5 621.5 Z M 969.5 604.5 L 1008.5 604.5 L 1008.5 624.5 L 969.5 624.5 Z M 575.5 616.5 L 607.5 616.5 L 607.5 635.5 L 575.5 635.5 Z M 1458.5 616.5 L 1496.5 616.5 L 1496.5 635.5 L 1458.5 635.5 Z M 369.5 626.5 L 403.5 626.5 L 403.5 635.5 L 369.5 635.5 Z M 518.5 616.5 L 556.5 616.5 L 556.5 635.5 L 518.5 635.5 Z M 479.5 626.5 L 499.5 626.5 L 499.5 635.5 L 479.5 635.5 Z M 1516.5 626.5 L 1549.5 626.5 L 1549.5 635.5 L 1516.5 635.5 Z M 422.5 616.5 L 460.5 616.5 L 460.5 635.5 L 422.5 635.5 Z M 1420.5 626.5 L 1439.5 626.5 L 1439.5 635.5 L 1420.5 635.5 Z M 1362.5 616.5 L 1400.5 616.5 L 1400.5 635.5 L 1362.5 635.5 Z M 1311.5 616.5 L 1343.5 616.5 L 1343.5 635.5 L 1311.5 635.5 Z M 313.5 614.5 L 340.5 614.5 L 340.5 636.5 L 313.5 636.5 Z M 1681.5 614.5 L 1705.5 614.5 L 1705.5 636.5 L 1681.5 636.5 Z M 1145.5 617.5 L 1174.5 617.5 L 1174.5 636.5 L 1145.5 636.5 Z M 1048.5 617.5 L 1087.5 617.5 L 1087.5 636.5 L 1048.5 636.5 Z M 832.5 617.5 L 870.5 617.5 L 870.5 636.5 L 832.5 636.5 Z M 745.5 617.5 L 773.5 617.5 L 773.5 636.5 L 745.5 636.5 Z M 793.5 627.5 L 812.5 627.5 L 812.5 636.5 L 793.5 636.5 Z M 213.5 614.5 L 237.5 614.5 L 237.5 636.5 L 213.5 636.5 Z M 1106.5 627.5 L 1126.5 627.5 L 1126.5 636.5 L 1106.5 636.5 Z M 639.5 634.5 L 677.5 634.5 L 677.5 636.5 L 639.5 636.5 Z M 256.5 614.5 L 294.5 614.5 L 294.5 636.5 L 256.5 636.5 Z M 1241.5 634.5 L 1279.5 634.5 L 1279.5 636.5 L 1241.5 636.5 Z M 1624.5 614.5 L 1662.5 614.5 L 1662.5 636.5 L 1624.5 636.5 Z M 1579.5 614.5 L 1605.5 614.5 L 1605.5 636.5 L 1579.5 636.5 Z M 890.5 621.5 L 949.5 621.5 L 949.5 641.5 L 890.5 641.5 Z M 969.5 624.5 L 1008.5 624.5 L 1008.5 643.5 L 969.5 643.5 Z M 1362.5 635.5 L 1400.5 635.5 L 1400.5 654.5 L 1362.5 654.5 Z M 479.5 635.5 L 499.5 635.5 L 499.5 654.5 L 479.5 654.5 Z M 575.5 635.5 L 607.5 635.5 L 607.5 654.5 L 575.5 654.5 Z M 1311.5 635.5 L 1343.5 635.5 L 1343.5 654.5 L 1311.5 654.5 Z M 1420.5 635.5 L 1439.5 635.5 L 1439.5 654.5 L 1420.5 654.5 Z M 1516.5 635.5 L 1549.5 635.5 L 1549.5 654.5 L 1516.5 654.5 Z M 1458.5 635.5 L 1496.5 635.5 L 1496.5 654.5 L 1458.5 654.5 Z M 369.5 635.5 L 403.5 635.5 L 403.5 654.5 L 369.5 654.5 Z M 422.5 635.5 L 460.5 635.5 L 460.5 654.5 L 422.5 654.5 Z M 518.5 635.5 L 556.5 635.5 L 556.5 654.5 L 518.5 654.5 Z M 213.5 636.5 L 237.5 636.5 L 237.5 656.5 L 213.5 656.5 Z M 1681.5 636.5 L 1705.5 636.5 L 1705.5 656.5 L 1681.5 656.5 Z M 639.5 636.5 L 773.5 636.5 L 773.5 656.5 L 639.5 656.5 Z M 1624.5 636.5 L 1662.5 636.5 L 1662.5 656.5 L 1624.5 656.5 Z M 832.5 636.5 L 870.5 636.5 L 870.5 656.5 L 832.5 656.5 Z M 1579.5 636.5 L 1605.5 636.5 L 1605.5 656.5 L 1579.5 656.5 Z M 793.5 636.5 L 812.5 636.5 L 812.5 656.5 L 793.5 656.5 Z M 1145.5 636.5 L 1279.5 636.5 L 1279.5 656.5 L 1145.5 656.5 Z M 256.5 636.5 L 294.5 636.5 L 294.5 656.5 L 256.5 656.5 Z M 313.5 636.5 L 340.5 636.5 L 340.5 656.5 L 313.5 656.5 Z M 1048.5 636.5 L 1087.5 636.5 L 1087.5 656.5 L 1048.5 656.5 Z M 1106.5 636.5 L 1126.5 636.5 L 1126.5 656.5 L 1106.5 656.5 Z M 256.5 656.5 L 294.5 656.5 L 294.5 660.5 L 256.5 660.5 Z M 518.5 654.5 L 556.5 654.5 L 556.5 660.5 L 518.5 660.5 Z M 1362.5 654.5 L 1400.5 654.5 L 1400.5 660.5 L 1362.5 660.5 Z M 1458.5 654.5 L 1496.5 654.5 L 1496.5 660.5 L 1458.5 660.5 Z M 1624.5 656.5 L 1662.5 656.5 L 1662.5 660.5 L 1624.5 660.5 Z M 639.5 656.5 L 773.5 656.5 L 773.5 660.5 L 639.5 660.5 Z M 1145.5 656.5 L 1279.5 656.5 L 1279.5 660.5 L 1145.5 660.5 Z M 890.5 641.5 L 949.5 641.5 L 949.5 660.5 L 890.5 660.5 Z M 422.5 654.5 L 460.5 654.5 L 460.5 660.5 L 422.5 660.5 Z M 832.5 656.5 L 870.5 656.5 L 870.5 660.5 L 832.5 660.5 Z M 1048.5 656.5 L 1087.5 656.5 L 1087.5 660.5 L 1048.5 660.5 Z M 969.5 643.5 L 1008.5 643.5 L 1008.5 662.5 L 969.5 662.5 Z M 313.5 656.5 L 340.5 656.5 L 340.5 680.5 L 313.5 680.5 Z M 969.5 662.5 L 1008.5 662.5 L 1008.5 680.5 L 969.5 680.5 Z M 1681.5 656.5 L 1705.5 656.5 L 1705.5 680.5 L 1681.5 680.5 Z M 1106.5 656.5 L 1126.5 656.5 L 1126.5 680.5 L 1106.5 680.5 Z M 369.5 654.5 L 403.5 654.5 L 403.5 680.5 L 369.5 680.5 Z M 1516.5 654.5 L 1549.5 654.5 L 1549.5 680.5 L 1516.5 680.5 Z M 793.5 656.5 L 812.5 656.5 L 812.5 680.5 L 793.5 680.5 Z M 213.5 656.5 L 237.5 656.5 L 237.5 680.5 L 213.5 680.5 Z M 479.5 654.5 L 499.5 654.5 L 499.5 680.5 L 479.5 680.5 Z M 1579.5 656.5 L 1605.5 656.5 L 1605.5 680.5 L 1579.5 680.5 Z M 1420.5 654.5 L 1439.5 654.5 L 1439.5 680.5 L 1420.5 680.5 Z M 575.5 654.5 L 607.5 654.5 L 607.5 680.5 L 575.5 680.5 Z M 1311.5 654.5 L 1343.5 654.5 L 1343.5 680.5 L 1311.5 680.5 Z M 196.5 680.5 L 1722.5 680.5 L 1722.5 699.5 L 196.5 699.5 Z M 196.5 680.5 "/>
 </clipPath>
+<clipPath id="clip14">
+  <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 842.5 540.5 L 875.5 540.5 L 875.5 543.5 L 842.5 543.5 Z M 369.5 540.5 L 402.5 540.5 L 402.5 543.5 L 369.5 543.5 Z M 735.5 540.5 L 769.5 540.5 L 769.5 543.5 L 735.5 543.5 Z M 963.5 540.5 L 996.5 540.5 L 996.5 543.5 L 963.5 543.5 Z M 1357.5 540.5 L 1390.5 540.5 L 1390.5 543.5 L 1357.5 543.5 Z M 1623.5 540.5 L 1664.5 540.5 L 1664.5 543.5 L 1623.5 543.5 Z M 1258.5 540.5 L 1291.5 540.5 L 1291.5 543.5 L 1258.5 543.5 Z M 313.5 540.5 L 346.5 540.5 L 346.5 543.5 L 313.5 543.5 Z M 429.5 540.5 L 463.5 540.5 L 463.5 543.5 L 429.5 543.5 Z M 1517.5 540.5 L 1550.5 540.5 L 1550.5 543.5 L 1517.5 543.5 Z M 1455.5 540.5 L 1488.5 540.5 L 1488.5 543.5 L 1455.5 543.5 Z M 1160.5 540.5 L 1193.5 540.5 L 1193.5 543.5 L 1160.5 543.5 Z M 528.5 540.5 L 561.5 540.5 L 561.5 543.5 L 528.5 543.5 Z M 626.5 540.5 L 659.5 540.5 L 659.5 543.5 L 626.5 543.5 Z M 254.5 540.5 L 296.5 540.5 L 296.5 543.5 L 254.5 543.5 Z M 1572.5 540.5 L 1605.5 540.5 L 1605.5 543.5 L 1572.5 543.5 Z M 1061.5 540.5 L 1095.5 540.5 L 1095.5 543.5 L 1061.5 543.5 Z M 1455.5 543.5 L 1488.5 543.5 L 1488.5 545.5 L 1455.5 545.5 Z M 528.5 543.5 L 561.5 543.5 L 561.5 545.5 L 528.5 545.5 Z M 1160.5 543.5 L 1193.5 543.5 L 1193.5 545.5 L 1160.5 545.5 Z M 626.5 543.5 L 659.5 543.5 L 659.5 545.5 L 626.5 545.5 Z M 1357.5 543.5 L 1390.5 543.5 L 1390.5 545.5 L 1357.5 545.5 Z M 1572.5 543.5 L 1605.5 543.5 L 1605.5 545.5 L 1572.5 545.5 Z M 369.5 543.5 L 402.5 543.5 L 402.5 545.5 L 369.5 545.5 Z M 1061.5 543.5 L 1095.5 543.5 L 1095.5 545.5 L 1061.5 545.5 Z M 842.5 543.5 L 875.5 543.5 L 875.5 545.5 L 842.5 545.5 Z M 963.5 543.5 L 996.5 543.5 L 996.5 545.5 L 963.5 545.5 Z M 313.5 543.5 L 346.5 543.5 L 346.5 545.5 L 313.5 545.5 Z M 429.5 543.5 L 463.5 543.5 L 463.5 545.5 L 429.5 545.5 Z M 735.5 543.5 L 769.5 543.5 L 769.5 545.5 L 735.5 545.5 Z M 1258.5 543.5 L 1291.5 543.5 L 1291.5 545.5 L 1258.5 545.5 Z M 1517.5 543.5 L 1550.5 543.5 L 1550.5 545.5 L 1517.5 545.5 Z M 313.5 545.5 L 402.5 545.5 L 402.5 561.5 L 313.5 561.5 Z M 429.5 545.5 L 659.5 545.5 L 659.5 561.5 L 429.5 561.5 Z M 735.5 545.5 L 1193.5 545.5 L 1193.5 561.5 L 735.5 561.5 Z M 1258.5 545.5 L 1488.5 545.5 L 1488.5 561.5 L 1258.5 561.5 Z M 1517.5 545.5 L 1605.5 545.5 L 1605.5 561.5 L 1517.5 561.5 Z M 963.5 561.5 L 996.5 561.5 L 996.5 563.5 L 963.5 563.5 Z M 1517.5 561.5 L 1550.5 561.5 L 1550.5 563.5 L 1517.5 563.5 Z M 429.5 561.5 L 463.5 561.5 L 463.5 563.5 L 429.5 563.5 Z M 1258.5 561.5 L 1291.5 561.5 L 1291.5 563.5 L 1258.5 563.5 Z M 313.5 561.5 L 346.5 561.5 L 346.5 563.5 L 313.5 563.5 Z M 735.5 561.5 L 769.5 561.5 L 769.5 563.5 L 735.5 563.5 Z M 528.5 561.5 L 561.5 561.5 L 561.5 563.5 L 528.5 563.5 Z M 1160.5 561.5 L 1193.5 561.5 L 1193.5 563.5 L 1160.5 563.5 Z M 626.5 561.5 L 659.5 561.5 L 659.5 563.5 L 626.5 563.5 Z M 369.5 561.5 L 402.5 561.5 L 402.5 563.5 L 369.5 563.5 Z M 1455.5 561.5 L 1488.5 561.5 L 1488.5 563.5 L 1455.5 563.5 Z M 842.5 561.5 L 875.5 561.5 L 875.5 563.5 L 842.5 563.5 Z M 1623.5 543.5 L 1664.5 543.5 L 1664.5 563.5 L 1623.5 563.5 Z M 1061.5 561.5 L 1095.5 561.5 L 1095.5 563.5 L 1061.5 563.5 Z M 1572.5 561.5 L 1605.5 561.5 L 1605.5 563.5 L 1572.5 563.5 Z M 254.5 543.5 L 296.5 543.5 L 296.5 563.5 L 254.5 563.5 Z M 1357.5 561.5 L 1390.5 561.5 L 1390.5 563.5 L 1357.5 563.5 Z M 313.5 563.5 L 346.5 563.5 L 346.5 566.5 L 313.5 566.5 Z M 528.5 563.5 L 561.5 563.5 L 561.5 566.5 L 528.5 566.5 Z M 1258.5 563.5 L 1291.5 563.5 L 1291.5 566.5 L 1258.5 566.5 Z M 1455.5 563.5 L 1488.5 563.5 L 1488.5 566.5 L 1455.5 566.5 Z M 842.5 563.5 L 875.5 563.5 L 875.5 566.5 L 842.5 566.5 Z M 254.5 563.5 L 296.5 563.5 L 296.5 566.5 L 254.5 566.5 Z M 1623.5 563.5 L 1664.5 563.5 L 1664.5 566.5 L 1623.5 566.5 Z M 1517.5 563.5 L 1550.5 563.5 L 1550.5 566.5 L 1517.5 566.5 Z M 735.5 563.5 L 769.5 563.5 L 769.5 566.5 L 735.5 566.5 Z M 1061.5 563.5 L 1095.5 563.5 L 1095.5 566.5 L 1061.5 566.5 Z M 429.5 563.5 L 463.5 563.5 L 463.5 566.5 L 429.5 566.5 Z M 1357.5 563.5 L 1390.5 563.5 L 1390.5 566.5 L 1357.5 566.5 Z M 1160.5 563.5 L 1193.5 563.5 L 1193.5 566.5 L 1160.5 566.5 Z M 1572.5 563.5 L 1605.5 563.5 L 1605.5 566.5 L 1572.5 566.5 Z M 369.5 563.5 L 402.5 563.5 L 402.5 566.5 L 369.5 566.5 Z M 626.5 563.5 L 659.5 563.5 L 659.5 566.5 L 626.5 566.5 Z M 963.5 563.5 L 996.5 563.5 L 996.5 566.5 L 963.5 566.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
+</clipPath>
+<clipPath id="clip15">
+  <path d="M 196.5 351.5 L 1722.5 351.5 L 1722.5 368.5 L 196.5 368.5 Z M 196.5 368.5 L 1722.5 368.5 L 1722.5 388.5 L 196.5 388.5 Z M 196.5 388.5 L 1722.5 388.5 L 1722.5 406.5 L 196.5 406.5 Z M 196.5 662.5 L 1722.5 662.5 L 1722.5 680.5 L 196.5 680.5 Z M 196.5 680.5 L 1722.5 680.5 L 1722.5 699.5 L 196.5 699.5 Z M 196.5 699.5 L 1722.5 699.5 L 1722.5 717.5 L 196.5 717.5 Z M 196.5 699.5 "/>
+</clipPath>
+<clipPath id="clip16">
+  <path d="M 1638.5 543.5 L 1657.5 543.5 L 1657.5 563.5 L 1638.5 563.5 Z M 261.5 543.5 L 280.5 543.5 L 280.5 563.5 L 261.5 563.5 Z M 320.5 543.5 L 340.5 543.5 L 340.5 563.5 L 320.5 563.5 Z M 376.5 543.5 L 395.5 543.5 L 395.5 563.5 L 376.5 563.5 Z M 436.5 543.5 L 456.5 543.5 L 456.5 563.5 L 436.5 563.5 Z M 535.5 543.5 L 554.5 543.5 L 554.5 563.5 L 535.5 563.5 Z M 633.5 543.5 L 652.5 543.5 L 652.5 563.5 L 633.5 563.5 Z M 742.5 543.5 L 762.5 543.5 L 762.5 563.5 L 742.5 563.5 Z M 849.5 543.5 L 868.5 543.5 L 868.5 563.5 L 849.5 563.5 Z M 970.5 543.5 L 989.5 543.5 L 989.5 563.5 L 970.5 563.5 Z M 1068.5 543.5 L 1088.5 543.5 L 1088.5 563.5 L 1068.5 563.5 Z M 1167.5 543.5 L 1186.5 543.5 L 1186.5 563.5 L 1167.5 563.5 Z M 1265.5 543.5 L 1285.5 543.5 L 1285.5 563.5 L 1265.5 563.5 Z M 1363.5 543.5 L 1383.5 543.5 L 1383.5 563.5 L 1363.5 563.5 Z M 1462.5 543.5 L 1481.5 543.5 L 1481.5 563.5 L 1462.5 563.5 Z M 1524.5 543.5 L 1543.5 543.5 L 1543.5 563.5 L 1524.5 563.5 Z M 1579.5 543.5 L 1599.5 543.5 L 1599.5 563.5 L 1579.5 563.5 Z M 1579.5 543.5 "/>
+</clipPath>
+<image id="image861" 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="#image861"/>
+</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 1581.5 368.5 L 1600.5 368.5 L 1600.5 388.5 L 1581.5 388.5 Z M 1055.5 368.5 L 1074.5 368.5 L 1074.5 388.5 L 1055.5 388.5 Z M 1107.5 368.5 L 1127.5 368.5 L 1127.5 388.5 L 1107.5 388.5 Z M 371.5 368.5 L 390.5 368.5 L 390.5 388.5 L 371.5 388.5 Z M 423.5 368.5 L 443.5 368.5 L 443.5 388.5 L 423.5 388.5 Z M 1212.5 368.5 L 1232.5 368.5 L 1232.5 388.5 L 1212.5 388.5 Z M 1160.5 368.5 L 1179.5 368.5 L 1179.5 388.5 L 1160.5 388.5 Z M 581.5 368.5 L 600.5 368.5 L 600.5 388.5 L 581.5 388.5 Z M 634.5 368.5 L 653.5 368.5 L 653.5 388.5 L 634.5 388.5 Z M 686.5 368.5 L 706.5 368.5 L 706.5 388.5 L 686.5 388.5 Z M 897.5 368.5 L 916.5 368.5 L 916.5 388.5 L 897.5 388.5 Z M 791.5 368.5 L 811.5 368.5 L 811.5 388.5 L 791.5 388.5 Z M 844.5 368.5 L 864.5 368.5 L 864.5 388.5 L 844.5 388.5 Z M 1528.5 368.5 L 1548.5 368.5 L 1548.5 388.5 L 1528.5 388.5 Z M 1476.5 368.5 L 1495.5 368.5 L 1495.5 388.5 L 1476.5 388.5 Z M 1423.5 368.5 L 1442.5 368.5 L 1442.5 388.5 L 1423.5 388.5 Z M 1370.5 368.5 L 1390.5 368.5 L 1390.5 388.5 L 1370.5 388.5 Z M 1318.5 368.5 L 1337.5 368.5 L 1337.5 388.5 L 1318.5 388.5 Z M 739.5 368.5 L 758.5 368.5 L 758.5 388.5 L 739.5 388.5 Z M 1002.5 368.5 L 1021.5 368.5 L 1021.5 388.5 L 1002.5 388.5 Z M 949.5 368.5 L 969.5 368.5 L 969.5 388.5 L 949.5 388.5 Z M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 265.5 368.5 L 285.5 368.5 L 285.5 388.5 L 265.5 388.5 Z M 318.5 368.5 L 337.5 368.5 L 337.5 388.5 L 318.5 388.5 Z M 476.5 368.5 L 495.5 368.5 L 495.5 388.5 L 476.5 388.5 Z M 528.5 368.5 L 548.5 368.5 L 548.5 388.5 L 528.5 388.5 Z M 1265.5 368.5 L 1285.5 368.5 L 1285.5 388.5 L 1265.5 388.5 Z M 1686.5 368.5 L 1705.5 368.5 L 1705.5 388.5 L 1686.5 388.5 Z M 1633.5 368.5 L 1653.5 368.5 L 1653.5 388.5 L 1633.5 388.5 Z M 476.5 680.5 L 495.5 680.5 L 495.5 699.5 L 476.5 699.5 Z M 1002.5 680.5 L 1021.5 680.5 L 1021.5 699.5 L 1002.5 699.5 Z M 949.5 680.5 L 969.5 680.5 L 969.5 699.5 L 949.5 699.5 Z M 897.5 680.5 L 916.5 680.5 L 916.5 699.5 L 897.5 699.5 Z M 265.5 680.5 L 285.5 680.5 L 285.5 699.5 L 265.5 699.5 Z M 318.5 680.5 L 337.5 680.5 L 337.5 699.5 L 318.5 699.5 Z M 1423.5 680.5 L 1442.5 680.5 L 1442.5 699.5 L 1423.5 699.5 Z M 634.5 680.5 L 653.5 680.5 L 653.5 699.5 L 634.5 699.5 Z M 686.5 680.5 L 706.5 680.5 L 706.5 699.5 L 686.5 699.5 Z M 739.5 680.5 L 758.5 680.5 L 758.5 699.5 L 739.5 699.5 Z M 791.5 680.5 L 811.5 680.5 L 811.5 699.5 L 791.5 699.5 Z M 844.5 680.5 L 864.5 680.5 L 864.5 699.5 L 844.5 699.5 Z M 1528.5 680.5 L 1548.5 680.5 L 1548.5 699.5 L 1528.5 699.5 Z M 1476.5 680.5 L 1495.5 680.5 L 1495.5 699.5 L 1476.5 699.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 1370.5 680.5 L 1390.5 680.5 L 1390.5 699.5 L 1370.5 699.5 Z M 1318.5 680.5 L 1337.5 680.5 L 1337.5 699.5 L 1318.5 699.5 Z M 1265.5 680.5 L 1285.5 680.5 L 1285.5 699.5 L 1265.5 699.5 Z M 1212.5 680.5 L 1232.5 680.5 L 1232.5 699.5 L 1212.5 699.5 Z M 1160.5 680.5 L 1179.5 680.5 L 1179.5 699.5 L 1160.5 699.5 Z M 1107.5 680.5 L 1127.5 680.5 L 1127.5 699.5 L 1107.5 699.5 Z M 1055.5 680.5 L 1074.5 680.5 L 1074.5 699.5 L 1055.5 699.5 Z M 1581.5 680.5 L 1600.5 680.5 L 1600.5 699.5 L 1581.5 699.5 Z M 1686.5 680.5 L 1705.5 680.5 L 1705.5 699.5 L 1686.5 699.5 Z M 1633.5 680.5 L 1653.5 680.5 L 1653.5 699.5 L 1633.5 699.5 Z M 581.5 680.5 L 600.5 680.5 L 600.5 699.5 L 581.5 699.5 Z M 528.5 680.5 L 548.5 680.5 L 548.5 699.5 L 528.5 699.5 Z M 371.5 680.5 L 390.5 680.5 L 390.5 699.5 L 371.5 699.5 Z M 423.5 680.5 L 443.5 680.5 L 443.5 699.5 L 423.5 699.5 Z M 423.5 680.5 "/>
+</clipPath>
+<pattern id="pattern8" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image861"/>
+</pattern>
+<mask id="mask8">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface365">
+<g id="surface855">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,20 +119,61 @@
 <g clip-path="url(#clip2)" clip-rule="nonzero">
 <rect x="0" y="0" width="1898" height="1059" style="fill:rgb(0%,87.058824%,0%);fill-opacity:0.496063;stroke:none;" mask="url(#mask0)"/>
 </g>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(78.431374%,45.490199%,10.196079%);stroke-opacity:0.496063;stroke-miterlimit:10;" d="M 213 399 L 232 399 M 213 380 L 232 380 M 213 380 L 213 399 M 232 380 L 232 399 " 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(24.313731%,81.568629%,24.313731%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1542 723 L 1744 723 M 1542 539 L 1744 539 M 1542 539 L 1542 723 M 1744 539 L 1744 723 M 174 723 L 376 723 M 174 539 L 376 539 M 174 539 L 174 723 M 376 539 L 376 723 M 1279 723 L 1586 723 M 1279 539 L 1586 539 M 1279 539 L 1279 723 M 1586 539 L 1586 723 M 332 723 L 639 723 M 332 539 L 639 539 M 332 539 L 332 723 M 639 539 L 639 723 M 1016 723 L 1323 723 M 1016 539 L 1323 539 M 1016 539 L 1016 723 M 1323 539 L 1323 723 M 595 723 L 902 723 M 595 539 L 902 539 M 595 539 L 595 723 M 902 539 L 902 723 M 858 723 L 1060 723 M 858 539 L 1060 539 M 858 539 L 858 723 M 1060 539 L 1060 723 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <g clip-path="url(#clip3)" clip-rule="nonzero">
-<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(78.431374%,45.490199%,10.196079%);fill-opacity:0.496063;stroke:none;" mask="url(#mask1)"/>
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(24.313731%,81.568629%,24.313731%);fill-opacity:0.724409;stroke:none;" mask="url(#mask1)"/>
 </g>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(78.431374%,45.490199%,10.196079%);stroke-opacity:0.496063;stroke-miterlimit:10;" d="M 213 399 L 232 399 M 213 380 L 232 380 M 213 380 L 213 399 M 232 380 L 232 399 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <g clip-path="url(#clip4)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(78.431374%,45.490199%,10.196079%);fill-opacity:0.496063;stroke:none;" mask="url(#mask2)"/>
+</g>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(77.64706%,53.333336%,43.137258%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1581 380 L 1581 399 M 1600 380 L 1600 399 M 318 399 L 337 399 M 318 380 L 337 380 M 318 380 L 318 399 M 337 380 L 337 399 M 1318 399 L 1338 399 M 1318 380 L 1338 380 M 1318 380 L 1318 399 M 1338 380 L 1338 399 M 580 399 L 600 399 M 580 380 L 600 380 M 580 380 L 580 399 M 600 380 L 600 399 M 1055 399 L 1075 399 M 1055 380 L 1075 380 M 1055 380 L 1055 399 M 1075 380 L 1075 399 M 844 399 L 863 399 M 844 380 L 863 380 M 844 380 L 844 399 M 863 380 L 863 399 M 897 399 L 916 399 M 897 380 L 916 380 M 897 380 L 897 399 M 916 380 L 916 399 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip5)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(77.64706%,53.333336%,43.137258%);fill-opacity:0.724409;stroke:none;" mask="url(#mask3)"/>
+</g>
+<g clip-path="url(#clip6)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(84.705883%,36.078435%,36.078435%);fill-opacity:0.724409;stroke:none;"/>
+</g>
+<g clip-path="url(#clip7)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(24.313731%,81.568629%,24.313731%);fill-opacity:0.724409;stroke:none;"/>
+</g>
+<g clip-path="url(#clip8)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(77.64706%,53.333336%,43.137258%);fill-opacity:0.724409;stroke:none;"/>
+</g>
+<g clip-path="url(#clip9)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(64.313728%,49.411768%,37.647063%);fill-opacity:0.724409;stroke:none;"/>
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(24.313731%,81.568629%,24.313731%);fill-opacity:0.724409;stroke:none;" mask="url(#mask4)"/>
+</g>
+<g clip-path="url(#clip10)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(70.588237%,26.666671%,30.588239%);fill-opacity:0.724409;stroke:none;"/>
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(77.64706%,53.333336%,43.137258%);fill-opacity:0.724409;stroke:none;" mask="url(#mask5)"/>
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,0%);fill-opacity:0.0787402;stroke:none;"/>
+</g>
+<g clip-path="url(#clip11)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(77.64706%,53.333336%,43.137258%);fill-opacity:0.724409;stroke:none;" mask="url(#mask6)"/>
+</g>
+<g clip-path="url(#clip12)" clip-rule="nonzero">
 <rect x="0" y="0" width="1898" height="1059" style="fill:rgb(18.039216%,50.196081%,100%);fill-opacity:0.629921;stroke:none;"/>
 </g>
-<g clip-path="url(#clip5)" clip-rule="nonzero">
+<g clip-path="url(#clip13)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(47.84314%,63.529414%,96.470588%);fill-opacity:0.503937;stroke:none;"/>
+</g>
+<g clip-path="url(#clip14)" clip-rule="nonzero">
 <rect x="0" y="0" width="1898" height="1059" style="fill:rgb(69.01961%,40.000004%,94.117647%);fill-opacity:0.629921;stroke:none;"/>
 </g>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,37.647063%,100%);stroke-opacity:0.944882;stroke-miterlimit:10;" d="M 261 536 L 280 536 M 261 516 L 280 516 M 261 516 L 261 536 M 280 516 L 280 536 M 320 536 L 340 536 M 320 516 L 340 516 M 320 516 L 320 536 M 340 516 L 340 536 M 376 536 L 395 536 M 376 516 L 395 516 M 376 516 L 376 536 M 395 516 L 395 536 M 436 536 L 456 536 M 436 516 L 456 516 M 436 516 L 436 536 M 456 516 L 456 536 M 535 536 L 554 536 M 535 516 L 554 516 M 535 516 L 535 536 M 554 516 L 554 536 M 633 536 L 652 536 M 633 516 L 652 516 M 633 516 L 633 536 M 652 516 L 652 536 M 742 536 L 762 536 M 742 516 L 762 516 M 742 516 L 742 536 M 762 516 L 762 536 M 849 536 L 868 536 M 849 516 L 868 516 M 849 516 L 849 536 M 868 516 L 868 536 M 970 536 L 989 536 M 970 516 L 989 516 M 970 516 L 970 536 M 989 516 L 989 536 M 1068 536 L 1088 536 M 1068 516 L 1088 516 M 1068 516 L 1068 536 M 1088 516 L 1088 536 M 1167 536 L 1186 536 M 1167 516 L 1186 516 M 1167 516 L 1167 536 M 1186 516 L 1186 536 M 1265 536 L 1285 536 M 1265 516 L 1285 516 M 1265 516 L 1265 536 M 1285 516 L 1285 536 M 1363 536 L 1383 536 M 1363 516 L 1383 516 M 1363 516 L 1363 536 M 1383 516 L 1383 536 M 1462 536 L 1481 536 M 1462 516 L 1481 516 M 1462 516 L 1462 536 M 1481 516 L 1481 536 M 1524 536 L 1543 536 M 1524 516 L 1543 516 M 1524 516 L 1524 536 M 1543 516 L 1543 536 M 1579 536 L 1599 536 M 1579 516 L 1599 516 M 1579 516 L 1579 536 M 1599 516 L 1599 536 M 1638 536 L 1657 536 M 1638 516 L 1657 516 M 1638 516 L 1638 536 M 1657 516 L 1657 536 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<g clip-path="url(#clip6)" clip-rule="nonzero">
-<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(0%,37.647063%,100%);fill-opacity:0.944882;stroke:none;" mask="url(#mask2)"/>
+<g clip-path="url(#clip15)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(72.941178%,58.039218%,85.490197%);fill-opacity:0.503937;stroke:none;"/>
 </g>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,37.647063%,100%);stroke-opacity:0.944882;stroke-miterlimit:10;" d="M 261 536 L 280 536 M 261 516 L 280 516 M 261 516 L 261 536 M 280 516 L 280 536 M 320 536 L 340 536 M 320 516 L 340 516 M 320 516 L 320 536 M 340 516 L 340 536 M 376 536 L 395 536 M 376 516 L 395 516 M 376 516 L 376 536 M 395 516 L 395 536 M 436 536 L 456 536 M 436 516 L 456 516 M 436 516 L 436 536 M 456 516 L 456 536 M 535 536 L 554 536 M 535 516 L 554 516 M 535 516 L 535 536 M 554 516 L 554 536 M 633 536 L 652 536 M 633 516 L 652 516 M 633 516 L 633 536 M 652 516 L 652 536 M 742 536 L 762 536 M 742 516 L 762 516 M 742 516 L 742 536 M 762 516 L 762 536 M 849 536 L 868 536 M 849 516 L 868 516 M 849 516 L 849 536 M 868 516 L 868 536 M 970 536 L 989 536 M 970 516 L 989 516 M 970 516 L 970 536 M 989 516 L 989 536 M 1068 536 L 1088 536 M 1068 516 L 1088 516 M 1068 516 L 1068 536 M 1088 516 L 1088 536 M 1167 536 L 1186 536 M 1167 516 L 1186 516 M 1167 516 L 1167 536 M 1186 516 L 1186 536 M 1265 536 L 1285 536 M 1265 516 L 1285 516 M 1265 516 L 1265 536 M 1285 516 L 1285 536 M 1363 536 L 1383 536 M 1363 516 L 1383 516 M 1363 516 L 1363 536 M 1383 516 L 1383 536 M 1462 536 L 1481 536 M 1462 516 L 1481 516 M 1462 516 L 1462 536 M 1481 516 L 1481 536 M 1524 536 L 1543 536 M 1524 516 L 1543 516 M 1524 516 L 1524 536 M 1543 516 L 1543 536 M 1579 536 L 1599 536 M 1579 516 L 1599 516 M 1579 516 L 1579 536 M 1599 516 L 1599 536 M 1638 536 L 1657 536 M 1638 516 L 1657 516 M 1638 516 L 1638 536 M 1657 516 L 1657 536 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip16)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(0%,37.647063%,100%);fill-opacity:0.944882;stroke:none;" mask="url(#mask7)"/>
+</g>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(18.039216%,61.176473%,61.176473%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1581 711 L 1600 711 M 1581 691 L 1600 691 M 1581 691 L 1581 711 M 1600 691 L 1600 711 M 1633 711 L 1653 711 M 1633 691 L 1653 691 M 1633 691 L 1633 711 M 1653 691 L 1653 711 M 1686 711 L 1705 711 M 1686 691 L 1705 691 M 1686 691 L 1686 711 M 1705 691 L 1705 711 M 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1581 380 L 1581 399 M 1600 380 L 1600 399 M 1633 399 L 1653 399 M 1633 380 L 1653 380 M 1633 380 L 1633 399 M 1653 380 L 1653 399 M 1686 399 L 1705 399 M 1686 380 L 1705 380 M 1686 380 L 1686 399 M 1705 380 L 1705 399 M 318 711 L 337 711 M 318 691 L 337 691 M 318 691 L 318 711 M 337 691 L 337 711 M 265 711 L 285 711 M 265 691 L 285 691 M 265 691 L 265 711 M 285 691 L 285 711 M 213 711 L 232 711 M 213 691 L 232 691 M 213 691 L 213 711 M 232 691 L 232 711 M 318 399 L 337 399 M 318 380 L 337 380 M 318 380 L 318 399 M 337 380 L 337 399 M 265 399 L 285 399 M 265 380 L 285 380 M 265 380 L 265 399 M 285 380 L 285 399 M 213 399 L 232 399 M 213 380 L 232 380 M 213 380 L 213 399 M 232 380 L 232 399 M 1318 711 L 1337 711 M 1318 691 L 1337 691 M 1318 691 L 1318 711 M 1337 691 L 1337 711 M 1370 711 L 1390 711 M 1370 691 L 1390 691 M 1370 691 L 1370 711 M 1390 691 L 1390 711 M 1423 711 L 1442 711 M 1423 691 L 1442 691 M 1423 691 L 1423 711 M 1442 691 L 1442 711 M 1476 711 L 1495 711 M 1476 691 L 1495 691 M 1476 691 L 1476 711 M 1495 691 L 1495 711 M 1528 711 L 1548 711 M 1528 691 L 1548 691 M 1528 691 L 1528 711 M 1548 691 L 1548 711 M 1318 399 L 1337 399 M 1318 380 L 1337 380 M 1318 380 L 1318 399 M 1337 380 L 1337 399 M 1370 399 L 1390 399 M 1370 380 L 1390 380 M 1370 380 L 1370 399 M 1390 380 L 1390 399 M 1423 399 L 1442 399 M 1423 380 L 1442 380 M 1423 380 L 1423 399 M 1442 380 L 1442 399 M 1476 399 L 1495 399 M 1476 380 L 1495 380 M 1476 380 L 1476 399 M 1495 380 L 1495 399 M 1528 399 L 1548 399 M 1528 380 L 1548 380 M 1528 380 L 1528 399 M 1548 380 L 1548 399 M 581 711 L 600 711 M 581 691 L 600 691 M 581 691 L 581 711 M 600 691 L 600 711 M 528 711 L 548 711 M 528 691 L 548 691 M 528 691 L 528 711 M 548 691 L 548 711 M 476 711 L 495 711 M 476 691 L 495 691 M 476 691 L 476 711 M 495 691 L 495 711 M 423 711 L 443 711 M 423 691 L 443 691 M 423 691 L 423 711 M 443 691 L 443 711 M 371 711 L 390 711 M 371 691 L 390 691 M 371 691 L 371 711 M 390 691 L 390 711 M 581 399 L 600 399 M 581 380 L 600 380 M 581 380 L 581 399 M 600 380 L 600 399 M 528 399 L 548 399 M 528 380 L 548 380 M 528 380 L 528 399 M 548 380 L 548 399 M 476 399 L 495 399 M 476 380 L 495 380 M 476 380 L 476 399 M 495 380 L 495 399 M 423 399 L 443 399 M 423 380 L 443 380 M 423 380 L 423 399 M 443 380 L 443 399 M 371 399 L 390 399 M 371 380 L 390 380 M 371 380 L 371 399 M 390 380 L 390 399 M 1055 711 L 1074 711 M 1055 691 L 1074 691 M 1055 691 L 1055 711 M 1074 691 L 1074 711 M 1107 711 L 1127 711 M 1107 691 L 1127 691 M 1107 691 L 1107 711 M 1127 691 L 1127 711 M 1160 711 L 1179 711 M 1160 691 L 1179 691 M 1160 691 L 1160 711 M 1179 691 L 1179 711 M 1212 711 L 1232 711 M 1212 691 L 1232 691 M 1212 691 L 1212 711 M 1232 691 L 1232 711 M 1265 711 L 1285 711 M 1265 691 L 1285 691 M 1265 691 L 1265 711 M 1285 691 L 1285 711 M 1055 399 L 1074 399 M 1055 380 L 1074 380 M 1055 380 L 1055 399 M 1074 380 L 1074 399 M 1107 399 L 1127 399 M 1107 380 L 1127 380 M 1107 380 L 1107 399 M 1127 380 L 1127 399 M 1160 399 L 1179 399 M 1160 380 L 1179 380 M 1160 380 L 1160 399 M 1179 380 L 1179 399 M 1212 399 L 1232 399 M 1212 380 L 1232 380 M 1212 380 L 1212 399 M 1232 380 L 1232 399 M 1265 399 L 1285 399 M 1265 380 L 1285 380 M 1265 380 L 1265 399 M 1285 380 L 1285 399 M 844 711 L 864 711 M 844 691 L 864 691 M 844 691 L 844 711 M 864 691 L 864 711 M 791 711 L 811 711 M 791 691 L 811 691 M 791 691 L 791 711 M 811 691 L 811 711 M 739 711 L 758 711 M 739 691 L 758 691 M 739 691 L 739 711 M 758 691 L 758 711 M 686 711 L 706 711 M 686 691 L 706 691 M 686 691 L 686 711 M 706 691 L 706 711 M 634 711 L 653 711 M 634 691 L 653 691 M 634 691 L 634 711 M 653 691 L 653 711 M 844 399 L 864 399 M 844 380 L 864 380 M 844 380 L 844 399 M 864 380 L 864 399 M 791 399 L 811 399 M 791 380 L 811 380 M 791 380 L 791 399 M 811 380 L 811 399 M 739 399 L 758 399 M 739 380 L 758 380 M 739 380 L 739 399 M 758 380 L 758 399 M 686 399 L 706 399 M 686 380 L 706 380 M 686 380 L 686 399 M 706 380 L 706 399 M 634 399 L 653 399 M 634 380 L 653 380 M 634 380 L 634 399 M 653 380 L 653 399 M 897 711 L 916 711 M 897 691 L 916 691 M 897 691 L 897 711 M 916 691 L 916 711 M 949 711 L 969 711 M 949 691 L 969 691 M 949 691 L 949 711 M 969 691 L 969 711 M 1002 711 L 1021 711 M 1002 691 L 1021 691 M 1002 691 L 1002 711 M 1021 691 L 1021 711 M 897 399 L 916 399 M 897 380 L 916 380 M 897 380 L 897 399 M 916 380 L 916 399 M 949 399 L 969 399 M 949 380 L 969 380 M 949 380 L 949 399 M 969 380 L 969 399 M 1002 399 L 1021 399 M 1002 380 L 1021 380 M 1002 380 L 1002 399 M 1021 380 L 1021 399 " 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(18.039216%,61.176473%,61.176473%);fill-opacity:0.724409;stroke:none;" mask="url(#mask8)"/>
+</g>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1585 667 L 1605 667 M 1585 648 L 1605 648 M 1585 648 L 1585 667 M 1605 648 L 1605 667 M 1585 628 L 1605 628 M 1585 609 L 1605 609 M 1585 609 L 1585 628 M 1605 609 L 1605 628 M 1585 589 L 1605 589 M 1585 570 L 1605 570 M 1585 570 L 1585 589 M 1605 570 L 1605 589 M 1633 667 L 1653 667 M 1633 648 L 1653 648 M 1633 648 L 1633 667 M 1653 648 L 1653 667 M 1633 628 L 1653 628 M 1633 609 L 1653 609 M 1633 609 L 1633 628 M 1653 609 L 1653 628 M 1633 589 L 1653 589 M 1633 570 L 1653 570 M 1633 570 L 1633 589 M 1653 570 L 1653 589 M 1681 667 L 1701 667 M 1681 648 L 1701 648 M 1681 648 L 1681 667 M 1701 648 L 1701 667 M 1681 628 L 1701 628 M 1681 609 L 1701 609 M 1681 609 L 1681 628 M 1701 609 L 1701 628 M 1681 589 L 1701 589 M 1681 570 L 1701 570 M 1681 570 L 1681 589 M 1701 570 L 1701 589 M 1585 532 L 1605 532 M 1585 513 L 1605 513 M 1585 513 L 1585 532 M 1605 513 L 1605 532 M 1585 484 L 1605 484 M 1585 465 L 1605 465 M 1585 465 L 1585 484 M 1605 465 L 1605 484 M 1585 443 L 1605 443 M 1585 423 L 1605 423 M 1585 423 L 1585 443 M 1605 423 L 1605 443 M 1633 484 L 1653 484 M 1633 465 L 1653 465 M 1633 465 L 1633 484 M 1653 465 L 1653 484 M 1633 443 L 1653 443 M 1633 423 L 1653 423 M 1633 423 L 1633 443 M 1653 423 L 1653 443 M 1681 484 L 1701 484 M 1681 465 L 1701 465 M 1681 465 L 1681 484 M 1701 465 L 1701 484 M 1681 443 L 1701 443 M 1681 423 L 1701 423 M 1681 423 L 1681 443 M 1701 423 L 1701 443 M 313 667 L 333 667 M 313 648 L 333 648 M 313 648 L 313 667 M 333 648 L 333 667 M 313 628 L 333 628 M 313 609 L 333 609 M 313 609 L 313 628 M 333 609 L 333 628 M 313 589 L 333 589 M 313 570 L 333 570 M 313 570 L 313 589 M 333 570 L 333 589 M 265 667 L 285 667 M 265 648 L 285 648 M 265 648 L 265 667 M 285 648 L 285 667 M 265 628 L 285 628 M 265 609 L 285 609 M 265 609 L 265 628 M 285 609 L 285 628 M 265 589 L 285 589 M 265 570 L 285 570 M 265 570 L 265 589 M 285 570 L 285 589 M 217 667 L 237 667 M 217 648 L 237 648 M 217 648 L 217 667 M 237 648 L 237 667 M 217 628 L 237 628 M 217 609 L 237 609 M 217 609 L 217 628 M 237 609 L 237 628 M 217 589 L 237 589 M 217 570 L 237 570 M 217 570 L 217 589 M 237 570 L 237 589 M 313 532 L 333 532 M 313 513 L 333 513 M 313 513 L 313 532 M 333 513 L 333 532 M 313 484 L 333 484 M 313 465 L 333 465 M 313 465 L 313 484 M 333 465 L 333 484 M 313 443 L 333 443 M 313 423 L 333 423 M 313 423 L 313 443 M 333 423 L 333 443 M 265 484 L 285 484 M 265 465 L 285 465 M 265 465 L 265 484 M 285 465 L 285 484 M 265 443 L 285 443 M 265 423 L 285 423 M 265 423 L 265 443 M 285 423 L 285 443 M 217 484 L 237 484 M 217 465 L 237 465 M 217 465 L 217 484 M 237 465 L 237 484 M 217 443 L 237 443 M 217 423 L 237 423 M 217 423 L 217 443 M 237 423 L 237 443 M 1323 663 L 1343 663 M 1323 643 L 1343 643 M 1323 643 L 1323 663 M 1343 643 L 1343 663 M 1323 624 L 1343 624 M 1323 604 L 1343 604 M 1323 604 L 1323 624 M 1343 604 L 1343 624 M 1323 585 L 1343 585 M 1323 565 L 1343 565 M 1323 565 L 1323 585 M 1343 565 L 1343 585 M 1371 667 L 1391 667 M 1371 648 L 1391 648 M 1371 648 L 1371 667 M 1391 648 L 1391 667 M 1371 628 L 1391 628 M 1371 609 L 1391 609 M 1371 609 L 1371 628 M 1391 609 L 1391 628 M 1420 663 L 1439 663 M 1420 643 L 1439 643 M 1420 643 L 1420 663 M 1439 643 L 1439 663 M 1420 624 L 1439 624 M 1420 604 L 1439 604 M 1420 604 L 1420 624 M 1439 604 L 1439 624 M 1420 585 L 1439 585 M 1420 565 L 1439 565 M 1420 565 L 1420 585 M 1439 565 L 1439 585 M 1468 624 L 1487 624 M 1468 604 L 1487 604 M 1468 604 L 1468 624 M 1487 604 L 1487 624 M 1468 585 L 1487 585 M 1468 565 L 1487 565 M 1468 565 L 1468 585 M 1487 565 L 1487 585 M 1516 667 L 1535 667 M 1516 648 L 1535 648 M 1516 648 L 1516 667 M 1535 648 L 1535 667 M 1516 628 L 1535 628 M 1516 609 L 1535 609 M 1516 609 L 1516 628 M 1535 609 L 1535 628 M 1365 532 L 1385 532 M 1365 513 L 1385 513 M 1365 513 L 1365 532 M 1385 513 L 1385 532 M 1468 532 L 1487 532 M 1468 513 L 1487 513 M 1468 513 L 1468 532 M 1487 513 L 1487 532 M 1323 483 L 1343 483 M 1323 463 L 1343 463 M 1323 463 L 1323 483 M 1343 463 L 1343 483 M 1323 444 L 1343 444 M 1323 425 L 1343 425 M 1323 425 L 1323 444 M 1343 425 L 1343 444 M 1371 483 L 1391 483 M 1371 463 L 1391 463 M 1371 463 L 1371 483 M 1391 463 L 1391 483 M 1371 444 L 1391 444 M 1371 425 L 1391 425 M 1371 425 L 1371 444 M 1391 425 L 1391 444 M 1420 444 L 1439 444 M 1420 425 L 1439 425 M 1420 425 L 1420 444 M 1439 425 L 1439 444 M 1468 483 L 1487 483 M 1468 463 L 1487 463 M 1468 463 L 1468 483 M 1487 463 L 1487 483 M 1468 444 L 1487 444 M 1468 425 L 1487 425 M 1468 425 L 1468 444 M 1487 425 L 1487 444 M 1516 444 L 1535 444 M 1516 425 L 1535 425 M 1516 425 L 1516 444 M 1535 425 L 1535 444 M 575 663 L 595 663 M 575 643 L 595 643 M 575 643 L 575 663 M 595 643 L 595 663 M 575 624 L 595 624 M 575 604 L 595 604 M 575 604 L 575 624 M 595 604 L 595 624 M 575 585 L 595 585 M 575 565 L 595 565 M 575 565 L 575 585 M 595 565 L 595 585 M 527 667 L 547 667 M 527 648 L 547 648 M 527 648 L 527 667 M 547 648 L 547 667 M 527 628 L 547 628 M 527 609 L 547 609 M 527 609 L 527 628 M 547 609 L 547 628 M 479 663 L 499 663 M 479 643 L 499 643 M 479 643 L 479 663 M 499 643 L 499 663 M 479 624 L 499 624 M 479 604 L 499 604 M 479 604 L 479 624 M 499 604 L 499 624 M 479 585 L 499 585 M 479 565 L 499 565 M 479 565 L 479 585 M 499 565 L 499 585 M 431 624 L 451 624 M 431 604 L 451 604 M 431 604 L 431 624 M 451 604 L 451 624 M 431 585 L 451 585 M 431 565 L 451 565 M 431 565 L 431 585 M 451 565 L 451 585 M 383 667 L 403 667 M 383 648 L 403 648 M 383 648 L 383 667 M 403 648 L 403 667 M 383 628 L 403 628 M 383 609 L 403 609 M 383 609 L 383 628 M 403 609 L 403 628 M 534 532 L 553 532 M 534 513 L 553 513 M 534 513 L 534 532 M 553 513 L 553 532 M 431 532 L 451 532 M 431 513 L 451 513 M 431 513 L 431 532 M 451 513 L 451 532 M 575 483 L 595 483 M 575 463 L 595 463 M 575 463 L 575 483 M 595 463 L 595 483 M 575 444 L 595 444 M 575 425 L 595 425 M 575 425 L 575 444 M 595 425 L 595 444 M 527 483 L 547 483 M 527 463 L 547 463 M 527 463 L 527 483 M 547 463 L 547 483 M 527 444 L 547 444 M 527 425 L 547 425 M 527 425 L 527 444 M 547 425 L 547 444 M 479 444 L 499 444 M 479 425 L 499 425 M 479 425 L 479 444 M 499 425 L 499 444 M 431 483 L 451 483 M 431 463 L 451 463 M 431 463 L 431 483 M 451 463 L 451 483 M 431 444 L 451 444 M 431 425 L 451 425 M 431 425 L 431 444 M 451 425 L 451 444 M 383 444 L 403 444 M 383 425 L 403 425 M 383 425 L 383 444 M 403 425 L 403 444 M 1058 667 L 1077 667 M 1058 648 L 1077 648 M 1058 648 L 1058 667 M 1077 648 L 1077 667 M 1058 628 L 1077 628 M 1058 609 L 1077 609 M 1058 609 L 1058 628 M 1077 609 L 1077 628 M 1058 589 L 1077 589 M 1058 570 L 1077 570 M 1058 570 L 1058 589 M 1077 570 L 1077 589 M 1106 667 L 1126 667 M 1106 648 L 1126 648 M 1106 648 L 1106 667 M 1126 648 L 1126 667 M 1106 628 L 1126 628 M 1106 609 L 1126 609 M 1106 609 L 1106 628 M 1126 609 L 1126 628 M 1106 589 L 1126 589 M 1106 570 L 1126 570 M 1106 570 L 1106 589 M 1126 570 L 1126 589 M 1154 667 L 1174 667 M 1154 648 L 1174 648 M 1154 648 L 1154 667 M 1174 648 L 1174 667 M 1154 628 L 1174 628 M 1154 609 L 1174 609 M 1154 609 L 1154 628 M 1174 609 L 1174 628 M 1202 667 L 1222 667 M 1202 648 L 1222 648 M 1202 648 L 1202 667 M 1222 648 L 1222 667 M 1202 628 L 1222 628 M 1202 609 L 1222 609 M 1202 609 L 1202 628 M 1222 609 L 1222 628 M 1202 589 L 1222 589 M 1202 570 L 1222 570 M 1202 570 L 1202 589 M 1222 570 L 1222 589 M 1250 667 L 1270 667 M 1250 648 L 1270 648 M 1250 648 L 1250 667 M 1270 648 L 1270 667 M 1250 628 L 1270 628 M 1250 609 L 1270 609 M 1250 609 L 1250 628 M 1270 609 L 1270 628 M 1106 532 L 1126 532 M 1106 513 L 1126 513 M 1106 513 L 1106 532 M 1126 513 L 1126 532 M 1202 532 L 1222 532 M 1202 513 L 1222 513 M 1202 513 L 1202 532 M 1222 513 L 1222 532 M 1058 482 L 1077 482 M 1058 462 L 1077 462 M 1058 462 L 1058 482 M 1077 462 L 1077 482 M 1058 443 L 1077 443 M 1058 423 L 1077 423 M 1058 423 L 1058 443 M 1077 423 L 1077 443 M 1106 443 L 1126 443 M 1106 423 L 1126 423 M 1106 423 L 1106 443 M 1126 423 L 1126 443 M 1154 482 L 1174 482 M 1154 462 L 1174 462 M 1154 462 L 1154 482 M 1174 462 L 1174 482 M 1154 443 L 1174 443 M 1154 423 L 1174 423 M 1154 423 L 1154 443 M 1174 423 L 1174 443 M 1202 484 L 1222 484 M 1202 465 L 1222 465 M 1202 465 L 1202 484 M 1222 465 L 1222 484 M 1250 443 L 1270 443 M 1250 423 L 1270 423 M 1250 423 L 1250 443 M 1270 423 L 1270 443 M 841 667 L 860 667 M 841 648 L 860 648 M 841 648 L 841 667 M 860 648 L 860 667 M 841 628 L 860 628 M 841 609 L 860 609 M 841 609 L 841 628 M 860 609 L 860 628 M 841 589 L 860 589 M 841 570 L 860 570 M 841 570 L 841 589 M 860 570 L 860 589 M 793 667 L 812 667 M 793 648 L 812 648 M 793 648 L 793 667 M 812 648 L 812 667 M 793 628 L 812 628 M 793 609 L 812 609 M 793 609 L 793 628 M 812 609 L 812 628 M 793 589 L 812 589 M 793 570 L 812 570 M 793 570 L 793 589 M 812 570 L 812 589 M 745 667 L 764 667 M 745 648 L 764 648 M 745 648 L 745 667 M 764 648 L 764 667 M 745 628 L 764 628 M 745 609 L 764 609 M 745 609 L 745 628 M 764 609 L 764 628 M 697 667 L 716 667 M 697 648 L 716 648 M 697 648 L 697 667 M 716 648 L 716 667 M 697 628 L 716 628 M 697 609 L 716 609 M 697 609 L 697 628 M 716 609 L 716 628 M 697 589 L 716 589 M 697 570 L 716 570 M 697 570 L 697 589 M 716 570 L 716 589 M 648 667 L 668 667 M 648 648 L 668 648 M 648 648 L 648 667 M 668 648 L 668 667 M 648 628 L 668 628 M 648 609 L 668 609 M 648 609 L 648 628 M 668 609 L 668 628 M 793 532 L 812 532 M 793 513 L 812 513 M 793 513 L 793 532 M 812 513 L 812 532 M 697 532 L 716 532 M 697 513 L 716 513 M 697 513 L 697 532 M 716 513 L 716 532 M 841 482 L 860 482 M 841 462 L 860 462 M 841 462 L 841 482 M 860 462 L 860 482 M 841 443 L 860 443 M 841 423 L 860 423 M 841 423 L 841 443 M 860 423 L 860 443 M 793 443 L 812 443 M 793 423 L 812 423 M 793 423 L 793 443 M 812 423 L 812 443 M 745 482 L 764 482 M 745 462 L 764 462 M 745 462 L 745 482 M 764 462 L 764 482 M 745 443 L 764 443 M 745 423 L 764 423 M 745 423 L 745 443 M 764 423 L 764 443 M 697 484 L 716 484 M 697 465 L 716 465 M 697 465 L 697 484 M 716 465 L 716 484 M 648 443 L 668 443 M 648 423 L 668 423 M 648 423 L 648 443 M 668 423 L 668 443 M 921 667 L 940 667 M 921 647 L 940 647 M 921 647 L 921 667 M 940 647 L 940 667 M 921 628 L 940 628 M 921 608 L 940 608 M 921 608 L 921 628 M 940 608 L 940 628 M 921 477 L 940 477 M 921 458 L 940 458 M 921 458 L 921 477 M 940 458 L 940 477 M 921 438 L 940 438 M 921 419 L 940 419 M 921 419 L 921 438 M 940 419 L 940 438 M 978 667 L 997 667 M 978 647 L 997 647 M 978 647 L 978 667 M 997 647 L 997 667 M 978 628 L 997 628 M 978 608 L 997 608 M 978 608 L 978 628 M 997 608 L 997 628 M 978 475 L 997 475 M 978 455 L 997 455 M 978 455 L 978 475 M 997 455 L 997 475 M 978 436 L 997 436 M 978 417 L 997 417 M 978 417 L 978 436 M 997 417 L 997 436 " 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(0%,0%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1585 648 L 1605 667 M 1585 667 L 1605 648 M 1585 609 L 1605 628 M 1585 628 L 1605 609 M 1585 570 L 1605 589 M 1585 589 L 1605 570 M 1633 648 L 1653 667 M 1633 667 L 1653 648 M 1633 609 L 1653 628 M 1633 628 L 1653 609 M 1633 570 L 1653 589 M 1633 589 L 1653 570 M 1681 648 L 1701 667 M 1681 667 L 1701 648 M 1681 609 L 1701 628 M 1681 628 L 1701 609 M 1681 570 L 1701 589 M 1681 589 L 1701 570 M 1585 513 L 1605 532 M 1585 532 L 1605 513 M 1585 465 L 1605 484 M 1585 484 L 1605 465 M 1585 423 L 1605 443 M 1585 443 L 1605 423 M 1633 465 L 1653 484 M 1633 484 L 1653 465 M 1633 423 L 1653 443 M 1633 443 L 1653 423 M 1681 465 L 1701 484 M 1681 484 L 1701 465 M 1681 423 L 1701 443 M 1681 443 L 1701 423 M 313 648 L 333 667 M 313 667 L 333 648 M 313 609 L 333 628 M 313 628 L 333 609 M 313 570 L 333 589 M 313 589 L 333 570 M 265 648 L 285 667 M 265 667 L 285 648 M 265 609 L 285 628 M 265 628 L 285 609 M 265 570 L 285 589 M 265 589 L 285 570 M 217 648 L 237 667 M 217 667 L 237 648 M 217 609 L 237 628 M 217 628 L 237 609 M 217 570 L 237 589 M 217 589 L 237 570 M 313 513 L 333 532 M 313 532 L 333 513 M 313 465 L 333 484 M 313 484 L 333 465 M 313 423 L 333 443 M 313 443 L 333 423 M 265 465 L 285 484 M 265 484 L 285 465 M 265 423 L 285 443 M 265 443 L 285 423 M 217 465 L 237 484 M 217 484 L 237 465 M 217 423 L 237 443 M 217 443 L 237 423 M 1323 643 L 1343 663 M 1323 663 L 1343 643 M 1323 604 L 1343 624 M 1323 624 L 1343 604 M 1323 565 L 1343 585 M 1323 585 L 1343 565 M 1371 648 L 1391 667 M 1371 667 L 1391 648 M 1371 609 L 1391 628 M 1371 628 L 1391 609 M 1420 643 L 1439 663 M 1420 663 L 1439 643 M 1420 604 L 1439 624 M 1420 624 L 1439 604 M 1420 565 L 1439 585 M 1420 585 L 1439 565 M 1468 604 L 1487 624 M 1468 624 L 1487 604 M 1468 565 L 1487 585 M 1468 585 L 1487 565 M 1516 648 L 1535 667 M 1516 667 L 1535 648 M 1516 609 L 1535 628 M 1516 628 L 1535 609 M 1365 513 L 1385 532 M 1365 532 L 1385 513 M 1468 513 L 1487 532 M 1468 532 L 1487 513 M 1323 463 L 1343 483 M 1323 483 L 1343 463 M 1323 425 L 1343 444 M 1323 444 L 1343 425 M 1371 463 L 1391 483 M 1371 483 L 1391 463 M 1371 425 L 1391 444 M 1371 444 L 1391 425 M 1420 425 L 1439 444 M 1420 444 L 1439 425 M 1468 463 L 1487 483 M 1468 483 L 1487 463 M 1468 425 L 1487 444 M 1468 444 L 1487 425 M 1516 425 L 1535 444 M 1516 444 L 1535 425 M 575 643 L 595 663 M 575 663 L 595 643 M 575 604 L 595 624 M 575 624 L 595 604 M 575 565 L 595 585 M 575 585 L 595 565 M 527 648 L 547 667 M 527 667 L 547 648 M 527 609 L 547 628 M 527 628 L 547 609 M 479 643 L 499 663 M 479 663 L 499 643 M 479 604 L 499 624 M 479 624 L 499 604 M 479 565 L 499 585 M 479 585 L 499 565 M 431 604 L 451 624 M 431 624 L 451 604 M 431 565 L 451 585 M 431 585 L 451 565 M 383 648 L 403 667 M 383 667 L 403 648 M 383 609 L 403 628 M 383 628 L 403 609 M 534 513 L 553 532 M 534 532 L 553 513 M 431 513 L 451 532 M 431 532 L 451 513 M 575 463 L 595 483 M 575 483 L 595 463 M 575 425 L 595 444 M 575 444 L 595 425 M 527 463 L 547 483 M 527 483 L 547 463 M 527 425 L 547 444 M 527 444 L 547 425 M 479 425 L 499 444 M 479 444 L 499 425 M 431 463 L 451 483 M 431 483 L 451 463 M 431 425 L 451 444 M 431 444 L 451 425 M 383 425 L 403 444 M 383 444 L 403 425 M 1058 648 L 1077 667 M 1058 667 L 1077 648 M 1058 609 L 1077 628 M 1058 628 L 1077 609 M 1058 570 L 1077 589 M 1058 589 L 1077 570 M 1106 648 L 1126 667 M 1106 667 L 1126 648 M 1106 609 L 1126 628 M 1106 628 L 1126 609 M 1106 570 L 1126 589 M 1106 589 L 1126 570 M 1154 648 L 1174 667 M 1154 667 L 1174 648 M 1154 609 L 1174 628 M 1154 628 L 1174 609 M 1202 648 L 1222 667 M 1202 667 L 1222 648 M 1202 609 L 1222 628 M 1202 628 L 1222 609 M 1202 570 L 1222 589 M 1202 589 L 1222 570 M 1250 648 L 1270 667 M 1250 667 L 1270 648 M 1250 609 L 1270 628 M 1250 628 L 1270 609 M 1106 513 L 1126 532 M 1106 532 L 1126 513 M 1202 513 L 1222 532 M 1202 532 L 1222 513 M 1058 462 L 1077 482 M 1058 482 L 1077 462 M 1058 423 L 1077 443 M 1058 443 L 1077 423 M 1106 423 L 1126 443 M 1106 443 L 1126 423 M 1154 462 L 1174 482 M 1154 482 L 1174 462 M 1154 423 L 1174 443 M 1154 443 L 1174 423 M 1202 465 L 1222 484 M 1202 484 L 1222 465 M 1250 423 L 1270 443 M 1250 443 L 1270 423 M 841 648 L 860 667 M 841 667 L 860 648 M 841 609 L 860 628 M 841 628 L 860 609 M 841 570 L 860 589 M 841 589 L 860 570 M 793 648 L 812 667 M 793 667 L 812 648 M 793 609 L 812 628 M 793 628 L 812 609 M 793 570 L 812 589 M 793 589 L 812 570 M 745 648 L 764 667 M 745 667 L 764 648 M 745 609 L 764 628 M 745 628 L 764 609 M 697 648 L 716 667 M 697 667 L 716 648 M 697 609 L 716 628 M 697 628 L 716 609 M 697 570 L 716 589 M 697 589 L 716 570 M 648 648 L 668 667 M 648 667 L 668 648 M 648 609 L 668 628 M 648 628 L 668 609 M 793 513 L 812 532 M 793 532 L 812 513 M 697 513 L 716 532 M 697 532 L 716 513 M 841 462 L 860 482 M 841 482 L 860 462 M 841 423 L 860 443 M 841 443 L 860 423 M 793 423 L 812 443 M 793 443 L 812 423 M 745 462 L 764 482 M 745 482 L 764 462 M 745 423 L 764 443 M 745 443 L 764 423 M 697 465 L 716 484 M 697 484 L 716 465 M 648 423 L 668 443 M 648 443 L 668 423 M 921 647 L 940 667 M 921 667 L 940 647 M 921 608 L 940 628 M 921 628 L 940 608 M 921 458 L 940 477 M 921 477 L 940 458 M 921 419 L 940 438 M 921 438 L 940 419 M 978 647 L 997 667 M 978 667 L 997 647 M 978 608 L 997 628 M 978 628 L 997 608 M 978 455 L 997 475 M 978 475 L 997 455 M 978 417 L 997 436 M 978 436 L 997 417 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 196 387 L 196 392 M 193 390 L 198 390 " transform="matrix(1,0,0,-1,0.5,1079.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 203.195312 697.046875 L 201.234375 697.046875 L 196.089844 682.734375 L 198.050781 682.734375 L 202.253906 694.847656 L 206.222656 682.734375 L 208.164062 682.734375 Z M 203.195312 697.046875 "/>
 <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 211.265625 689.941406 L 211.285156 690.609375 L 211.347656 691.234375 L 211.464844 691.824219 L 211.621094 692.414062 L 211.835938 692.964844 L 212.113281 693.476562 L 212.582031 694.203125 L 213.152344 694.789062 L 213.800781 695.261719 L 214.527344 695.59375 L 215.351562 695.8125 L 216.253906 695.890625 L 216.390625 695.890625 L 217 695.871094 L 217.589844 695.773438 L 218.121094 695.59375 L 218.628906 695.378906 L 219.101562 695.085938 L 219.554688 694.710938 L 219.925781 694.320312 L 220.242188 693.886719 L 220.496094 693.394531 L 220.671875 692.886719 L 220.789062 692.335938 L 220.867188 691.746094 L 220.867188 691.550781 L 220.886719 691.492188 L 220.886719 691.097656 L 216.53125 691.097656 L 216.53125 689.488281 L 222.5 689.488281 L 222.5 697.125 L 221.339844 697.125 L 220.886719 695.222656 L 220.261719 695.851562 L 219.59375 696.378906 L 218.90625 696.8125 L 218.179688 697.105469 L 217.433594 697.324219 L 216.667969 697.460938 L 216.429688 697.460938 L 216.332031 697.480469 L 216.097656 697.480469 L 216 697.5 L 215.175781 697.441406 L 214.390625 697.304688 L 213.644531 697.085938 L 212.957031 696.773438 L 212.308594 696.359375 L 211.699219 695.851562 L 211.148438 695.300781 L 210.679688 694.671875 L 210.285156 694.003906 L 209.972656 693.257812 L 209.714844 692.453125 L 209.558594 691.589844 L 209.519531 691.355469 L 209.480469 691.097656 L 209.460938 690.84375 L 209.441406 690.570312 L 209.441406 690.039062 L 209.460938 689.3125 L 209.539062 688.605469 L 209.65625 687.917969 L 209.851562 687.25 L 210.070312 686.601562 L 210.363281 685.953125 L 210.855469 685.128906 L 211.425781 684.402344 L 212.113281 683.792969 L 212.859375 683.304688 L 213.703125 682.929688 L 214.644531 682.65625 L 214.898438 682.617188 L 215.175781 682.578125 L 215.449219 682.558594 L 215.722656 682.519531 L 216.019531 682.519531 L 216.3125 682.5 L 217.257812 682.558594 L 218.140625 682.695312 L 218.945312 682.929688 L 219.671875 683.265625 L 220.320312 683.695312 L 220.90625 684.207031 L 221.242188 684.597656 L 221.535156 685.03125 L 221.792969 685.503906 L 222.007812 685.992188 L 222.164062 686.523438 L 222.300781 687.074219 L 220.4375 687.074219 L 220.28125 686.5625 L 220.082031 686.09375 L 219.808594 685.660156 L 219.496094 685.285156 L 219.101562 684.953125 L 218.667969 684.660156 L 218.316406 684.5 L 217.941406 684.363281 L 217.550781 684.246094 L 217.15625 684.1875 L 216.726562 684.128906 L 216.292969 684.109375 L 215.566406 684.167969 L 214.898438 684.285156 L 214.292969 684.480469 L 213.722656 684.777344 L 213.191406 685.148438 L 212.71875 685.601562 L 212.289062 686.152344 L 211.933594 686.757812 L 211.660156 687.425781 L 211.445312 688.152344 L 211.304688 688.9375 L 211.265625 689.785156 Z M 211.265625 689.941406 "/>
@@ -262,385 +237,308 @@
 <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 241.886719 381.414062 L 241.847656 382.042969 L 241.75 382.613281 L 241.574219 383.144531 L 241.335938 383.613281 L 241.023438 384.066406 L 240.648438 384.460938 L 240.238281 384.792969 L 239.804688 385.046875 L 239.316406 385.246094 L 238.804688 385.402344 L 238.253906 385.480469 L 237.664062 385.5 L 231.207031 385.5 L 231.207031 371.1875 L 237.015625 371.1875 L 237.863281 371.246094 L 238.609375 371.382812 L 239.277344 371.617188 L 239.84375 371.953125 L 240.335938 372.382812 L 240.730469 372.914062 L 240.886719 373.207031 L 241.023438 373.523438 L 241.121094 373.816406 L 241.199219 374.152344 L 241.238281 374.484375 L 241.257812 374.820312 L 241.199219 375.523438 L 241.023438 376.132812 L 240.75 376.703125 L 240.355469 377.175781 L 239.863281 377.605469 L 239.277344 377.941406 L 239.84375 378.195312 L 240.335938 378.46875 L 240.769531 378.785156 L 241.121094 379.136719 L 241.394531 379.511719 L 241.613281 379.902344 L 241.691406 380.140625 L 241.808594 380.609375 L 241.847656 380.886719 L 241.867188 381.140625 Z M 239.433594 375.074219 L 239.375 374.484375 L 239.195312 373.992188 L 238.921875 373.5625 L 238.53125 373.246094 L 238.039062 373.011719 L 237.429688 372.855469 L 237.292969 372.855469 L 237.15625 372.835938 L 237.015625 372.816406 L 236.703125 372.816406 L 236.566406 372.796875 L 233.03125 372.796875 L 233.03125 377.351562 L 236.566406 377.351562 L 237.292969 377.3125 L 237.921875 377.195312 L 238.449219 376.976562 L 238.84375 376.683594 L 239.15625 376.292969 L 239.355469 375.820312 L 239.375 375.722656 L 239.394531 375.605469 L 239.414062 375.484375 L 239.414062 375.210938 Z M 237.488281 383.890625 L 238.039062 383.871094 L 238.53125 383.753906 L 238.960938 383.554688 L 239.316406 383.300781 L 239.609375 382.96875 L 239.84375 382.554688 L 239.902344 382.398438 L 239.941406 382.222656 L 240.003906 382.023438 L 240.023438 381.847656 L 240.042969 381.652344 L 240.0625 381.433594 L 240.023438 381.003906 L 239.941406 380.589844 L 239.804688 380.238281 L 239.609375 379.902344 L 239.355469 379.628906 L 239.058594 379.375 L 238.84375 379.257812 L 238.609375 379.15625 L 238.351562 379.078125 L 238.078125 379.019531 L 237.785156 378.980469 L 237.488281 378.960938 L 233.03125 378.960938 L 233.03125 383.890625 Z M 237.488281 383.890625 "/>
 <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 213 711 L 232 711 M 213 691 L 232 691 M 213 691 L 213 711 M 232 691 L 232 711 " 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 213 711 L 232 711 M 213 691 L 232 691 M 232 711 L 232 691 M 213 711 L 213 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<g clip-path="url(#clip7)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="1584.5" y="480.5"/>
-  <use xlink:href="#glyph0-2" x="1593.87793" y="480.5"/>
-  <use xlink:href="#glyph0-3" x="1604.301758" y="480.5"/>
-  <use xlink:href="#glyph0-4" x="1614.954102" y="480.5"/>
-  <use xlink:href="#glyph0-5" x="1626.40625" y="480.5"/>
-  <use xlink:href="#glyph0-6" x="1637.858398" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1649.310547" y="480.5"/>
-  <use xlink:href="#glyph0-8" x="1658.310547" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="1664.647461" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1676.073242" y="480.5"/>
-  <use xlink:href="#glyph0-1" x="1685.073242" y="480.5"/>
-  <use xlink:href="#glyph0-10" x="1694.451172" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1704.347656" y="480.5"/>
-  <use xlink:href="#glyph0-11" x="1713.347656" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="1724.755859" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1736.181641" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1745.181641" y="480.5"/>
-  <use xlink:href="#glyph0-12" x="1754.181641" y="480.5"/>
-  <use xlink:href="#glyph0-13" x="1759.182617" y="480.5"/>
-  <use xlink:href="#glyph0-14" x="1770.59082" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1781.243164" y="480.5"/>
-  <use xlink:href="#glyph0-15" x="1790.243164" y="480.5"/>
-</g>
-</g>
-<g clip-path="url(#clip8)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph1-1" x="1525.5" y="603.5"/>
-  <use xlink:href="#glyph1-2" x="1530.709961" y="603.5"/>
-  <use xlink:href="#glyph1-3" x="1536.500977" y="603.5"/>
-  <use xlink:href="#glyph1-4" x="1542.418945" y="603.5"/>
-  <use xlink:href="#glyph1-5" x="1548.78125" y="603.5"/>
-  <use xlink:href="#glyph1-6" x="1555.143555" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1561.505859" y="603.5"/>
-  <use xlink:href="#glyph1-8" x="1566.505859" y="603.5"/>
-  <use xlink:href="#glyph1-9" x="1570.026367" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1576.374023" y="603.5"/>
-  <use xlink:href="#glyph1-1" x="1581.374023" y="603.5"/>
-  <use xlink:href="#glyph1-10" x="1586.583984" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1592.082031" y="603.5"/>
-  <use xlink:href="#glyph1-11" x="1597.082031" y="603.5"/>
-  <use xlink:href="#glyph1-9" x="1603.419922" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1609.767578" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1614.767578" y="603.5"/>
-  <use xlink:href="#glyph1-12" x="1619.767578" y="603.5"/>
-  <use xlink:href="#glyph1-13" x="1622.545898" y="603.5"/>
-  <use xlink:href="#glyph1-14" x="1628.883789" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1634.801758" y="603.5"/>
-  <use xlink:href="#glyph1-15" x="1639.801758" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="1646.164062" y="603.5"/>
-  <use xlink:href="#glyph1-6" x="1651.164062" y="603.5"/>
-</g>
-</g>
-<g clip-path="url(#clip9)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="216.5" y="480.5"/>
-  <use xlink:href="#glyph0-2" x="225.87793" y="480.5"/>
-  <use xlink:href="#glyph0-3" x="236.301758" y="480.5"/>
-  <use xlink:href="#glyph0-4" x="246.954102" y="480.5"/>
-  <use xlink:href="#glyph0-5" x="258.40625" y="480.5"/>
-  <use xlink:href="#glyph0-6" x="269.858398" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="281.310547" y="480.5"/>
-  <use xlink:href="#glyph0-8" x="290.310547" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="296.647461" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="308.073242" y="480.5"/>
-  <use xlink:href="#glyph0-1" x="317.073242" y="480.5"/>
-  <use xlink:href="#glyph0-10" x="326.451172" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="336.347656" y="480.5"/>
-  <use xlink:href="#glyph0-11" x="345.347656" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="356.755859" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="368.181641" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="377.181641" y="480.5"/>
-  <use xlink:href="#glyph0-12" x="386.181641" y="480.5"/>
-  <use xlink:href="#glyph0-13" x="391.182617" y="480.5"/>
-  <use xlink:href="#glyph0-14" x="402.59082" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="413.243164" y="480.5"/>
-  <use xlink:href="#glyph0-15" x="422.243164" y="480.5"/>
-</g>
-</g>
-<g clip-path="url(#clip10)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph1-1" x="158.5" y="603.5"/>
-  <use xlink:href="#glyph1-2" x="163.709961" y="603.5"/>
-  <use xlink:href="#glyph1-3" x="169.500977" y="603.5"/>
-  <use xlink:href="#glyph1-4" x="175.418945" y="603.5"/>
-  <use xlink:href="#glyph1-5" x="181.78125" y="603.5"/>
-  <use xlink:href="#glyph1-6" x="188.143555" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="194.505859" y="603.5"/>
-  <use xlink:href="#glyph1-8" x="199.505859" y="603.5"/>
-  <use xlink:href="#glyph1-9" x="203.026367" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="209.374023" y="603.5"/>
-  <use xlink:href="#glyph1-1" x="214.374023" y="603.5"/>
-  <use xlink:href="#glyph1-10" x="219.583984" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="225.082031" y="603.5"/>
-  <use xlink:href="#glyph1-11" x="230.082031" y="603.5"/>
-  <use xlink:href="#glyph1-9" x="236.419922" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="242.767578" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="247.767578" y="603.5"/>
-  <use xlink:href="#glyph1-12" x="252.767578" y="603.5"/>
-  <use xlink:href="#glyph1-13" x="255.545898" y="603.5"/>
-  <use xlink:href="#glyph1-14" x="261.883789" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="267.801758" y="603.5"/>
-  <use xlink:href="#glyph1-15" x="272.801758" y="603.5"/>
-  <use xlink:href="#glyph1-7" x="279.164062" y="603.5"/>
-  <use xlink:href="#glyph1-4" x="284.164062" y="603.5"/>
-</g>
-</g>
-<g clip-path="url(#clip11)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="1369.5" y="480.5"/>
-  <use xlink:href="#glyph0-2" x="1378.87793" y="480.5"/>
-  <use xlink:href="#glyph0-3" x="1389.301758" y="480.5"/>
-  <use xlink:href="#glyph0-4" x="1399.954102" y="480.5"/>
-  <use xlink:href="#glyph0-5" x="1411.40625" y="480.5"/>
-  <use xlink:href="#glyph0-6" x="1422.858398" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1434.310547" y="480.5"/>
-  <use xlink:href="#glyph0-8" x="1443.310547" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="1449.647461" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1461.073242" y="480.5"/>
-  <use xlink:href="#glyph0-1" x="1470.073242" y="480.5"/>
-  <use xlink:href="#glyph0-10" x="1479.451172" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1489.347656" y="480.5"/>
-  <use xlink:href="#glyph0-11" x="1498.347656" y="480.5"/>
-  <use xlink:href="#glyph0-9" x="1509.755859" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1521.181641" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1530.181641" y="480.5"/>
-  <use xlink:href="#glyph0-13" x="1539.181641" y="480.5"/>
-  <use xlink:href="#glyph0-16" x="1550.589844" y="480.5"/>
-  <use xlink:href="#glyph0-17" x="1561.602539" y="480.5"/>
-  <use xlink:href="#glyph0-15" x="1569.00293" y="480.5"/>
-  <use xlink:href="#glyph0-7" x="1580.455078" y="480.5"/>
-  <use xlink:href="#glyph0-15" x="1589.455078" y="480.5"/>
-</g>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="1307.5" y="605.5"/>
-  <use xlink:href="#glyph0-2" x="1316.87793" y="605.5"/>
-  <use xlink:href="#glyph0-3" x="1327.301758" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="1337.954102" y="605.5"/>
-  <use xlink:href="#glyph0-5" x="1349.40625" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="1360.858398" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1372.310547" y="605.5"/>
-  <use xlink:href="#glyph0-8" x="1381.310547" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="1387.647461" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1399.073242" y="605.5"/>
-  <use xlink:href="#glyph0-1" x="1408.073242" y="605.5"/>
-  <use xlink:href="#glyph0-10" x="1417.451172" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1427.347656" y="605.5"/>
-  <use xlink:href="#glyph0-11" x="1436.347656" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="1447.755859" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1459.181641" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1468.181641" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="1477.181641" y="605.5"/>
-  <use xlink:href="#glyph0-16" x="1488.589844" y="605.5"/>
-  <use xlink:href="#glyph0-17" x="1499.602539" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="1507.00293" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1518.455078" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="1527.455078" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1538.907227" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="1547.907227" y="605.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="371.5" y="483.5"/>
-  <use xlink:href="#glyph0-2" x="380.87793" y="483.5"/>
-  <use xlink:href="#glyph0-3" x="391.301758" y="483.5"/>
-  <use xlink:href="#glyph0-4" x="401.954102" y="483.5"/>
-  <use xlink:href="#glyph0-5" x="413.40625" y="483.5"/>
-  <use xlink:href="#glyph0-6" x="424.858398" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="436.310547" y="483.5"/>
-  <use xlink:href="#glyph0-8" x="445.310547" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="451.647461" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="463.073242" y="483.5"/>
-  <use xlink:href="#glyph0-1" x="472.073242" y="483.5"/>
-  <use xlink:href="#glyph0-10" x="481.451172" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="491.347656" y="483.5"/>
-  <use xlink:href="#glyph0-11" x="500.347656" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="511.755859" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="523.181641" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="532.181641" y="483.5"/>
-  <use xlink:href="#glyph0-13" x="541.181641" y="483.5"/>
-  <use xlink:href="#glyph0-16" x="552.589844" y="483.5"/>
-  <use xlink:href="#glyph0-17" x="563.602539" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="571.00293" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="582.455078" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="591.455078" y="483.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="360.5" y="605.5"/>
-  <use xlink:href="#glyph0-2" x="369.87793" y="605.5"/>
-  <use xlink:href="#glyph0-3" x="380.301758" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="390.954102" y="605.5"/>
-  <use xlink:href="#glyph0-5" x="402.40625" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="413.858398" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="425.310547" y="605.5"/>
-  <use xlink:href="#glyph0-8" x="434.310547" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="440.647461" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="452.073242" y="605.5"/>
-  <use xlink:href="#glyph0-1" x="461.073242" y="605.5"/>
-  <use xlink:href="#glyph0-10" x="470.451172" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="480.347656" y="605.5"/>
-  <use xlink:href="#glyph0-11" x="489.347656" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="500.755859" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="512.181641" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="521.181641" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="530.181641" y="605.5"/>
-  <use xlink:href="#glyph0-16" x="541.589844" y="605.5"/>
-  <use xlink:href="#glyph0-17" x="552.602539" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="560.00293" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="571.455078" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="580.455078" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="591.907227" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="600.907227" y="605.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="1047.5" y="483.5"/>
-  <use xlink:href="#glyph0-2" x="1056.87793" y="483.5"/>
-  <use xlink:href="#glyph0-3" x="1067.301758" y="483.5"/>
-  <use xlink:href="#glyph0-4" x="1077.954102" y="483.5"/>
-  <use xlink:href="#glyph0-5" x="1089.40625" y="483.5"/>
-  <use xlink:href="#glyph0-6" x="1100.858398" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1112.310547" y="483.5"/>
-  <use xlink:href="#glyph0-8" x="1121.310547" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="1127.647461" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1139.073242" y="483.5"/>
-  <use xlink:href="#glyph0-1" x="1148.073242" y="483.5"/>
-  <use xlink:href="#glyph0-10" x="1157.451172" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1167.347656" y="483.5"/>
-  <use xlink:href="#glyph0-11" x="1176.347656" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="1187.755859" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1199.181641" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1208.181641" y="483.5"/>
-  <use xlink:href="#glyph0-13" x="1217.181641" y="483.5"/>
-  <use xlink:href="#glyph0-18" x="1228.589844" y="483.5"/>
-  <use xlink:href="#glyph0-13" x="1239.620117" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="1251.02832" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="1262.454102" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="1273.90625" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="1282.90625" y="483.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="1036.5" y="605.5"/>
-  <use xlink:href="#glyph0-2" x="1045.87793" y="605.5"/>
-  <use xlink:href="#glyph0-3" x="1056.301758" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="1066.954102" y="605.5"/>
-  <use xlink:href="#glyph0-5" x="1078.40625" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="1089.858398" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1101.310547" y="605.5"/>
-  <use xlink:href="#glyph0-8" x="1110.310547" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="1116.647461" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1128.073242" y="605.5"/>
-  <use xlink:href="#glyph0-1" x="1137.073242" y="605.5"/>
-  <use xlink:href="#glyph0-10" x="1146.451172" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1156.347656" y="605.5"/>
-  <use xlink:href="#glyph0-11" x="1165.347656" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="1176.755859" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1188.181641" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1197.181641" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="1206.181641" y="605.5"/>
-  <use xlink:href="#glyph0-18" x="1217.589844" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="1228.620117" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="1240.02832" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="1251.454102" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1262.90625" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="1271.90625" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="1283.358398" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="1292.358398" y="605.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="626.5" y="483.5"/>
-  <use xlink:href="#glyph0-2" x="635.87793" y="483.5"/>
-  <use xlink:href="#glyph0-3" x="646.301758" y="483.5"/>
-  <use xlink:href="#glyph0-4" x="656.954102" y="483.5"/>
-  <use xlink:href="#glyph0-5" x="668.40625" y="483.5"/>
-  <use xlink:href="#glyph0-6" x="679.858398" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="691.310547" y="483.5"/>
-  <use xlink:href="#glyph0-8" x="700.310547" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="706.647461" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="718.073242" y="483.5"/>
-  <use xlink:href="#glyph0-1" x="727.073242" y="483.5"/>
-  <use xlink:href="#glyph0-10" x="736.451172" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="746.347656" y="483.5"/>
-  <use xlink:href="#glyph0-11" x="755.347656" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="766.755859" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="778.181641" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="787.181641" y="483.5"/>
-  <use xlink:href="#glyph0-13" x="796.181641" y="483.5"/>
-  <use xlink:href="#glyph0-18" x="807.589844" y="483.5"/>
-  <use xlink:href="#glyph0-13" x="818.620117" y="483.5"/>
-  <use xlink:href="#glyph0-9" x="830.02832" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="841.454102" y="483.5"/>
-  <use xlink:href="#glyph0-7" x="852.90625" y="483.5"/>
-  <use xlink:href="#glyph0-15" x="861.90625" y="483.5"/>
-</g>
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="616.5" y="605.5"/>
-  <use xlink:href="#glyph0-2" x="625.87793" y="605.5"/>
-  <use xlink:href="#glyph0-3" x="636.301758" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="646.954102" y="605.5"/>
-  <use xlink:href="#glyph0-5" x="658.40625" y="605.5"/>
-  <use xlink:href="#glyph0-6" x="669.858398" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="681.310547" y="605.5"/>
-  <use xlink:href="#glyph0-8" x="690.310547" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="696.647461" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="708.073242" y="605.5"/>
-  <use xlink:href="#glyph0-1" x="717.073242" y="605.5"/>
-  <use xlink:href="#glyph0-10" x="726.451172" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="736.347656" y="605.5"/>
-  <use xlink:href="#glyph0-11" x="745.347656" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="756.755859" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="768.181641" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="777.181641" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="786.181641" y="605.5"/>
-  <use xlink:href="#glyph0-18" x="797.589844" y="605.5"/>
-  <use xlink:href="#glyph0-13" x="808.620117" y="605.5"/>
-  <use xlink:href="#glyph0-9" x="820.02832" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="831.454102" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="842.90625" y="605.5"/>
-  <use xlink:href="#glyph0-15" x="851.90625" y="605.5"/>
-  <use xlink:href="#glyph0-7" x="863.358398" y="605.5"/>
-  <use xlink:href="#glyph0-4" x="872.358398" y="605.5"/>
-</g>
-<g clip-path="url(#clip12)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph1-1" x="843.5" y="481.5"/>
-  <use xlink:href="#glyph1-2" x="848.709961" y="481.5"/>
-  <use xlink:href="#glyph1-3" x="854.500977" y="481.5"/>
-  <use xlink:href="#glyph1-4" x="860.418945" y="481.5"/>
-  <use xlink:href="#glyph1-5" x="866.78125" y="481.5"/>
-  <use xlink:href="#glyph1-6" x="873.143555" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="879.505859" y="481.5"/>
-  <use xlink:href="#glyph1-8" x="884.505859" y="481.5"/>
-  <use xlink:href="#glyph1-9" x="888.026367" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="894.374023" y="481.5"/>
-  <use xlink:href="#glyph1-1" x="899.374023" y="481.5"/>
-  <use xlink:href="#glyph1-10" x="904.583984" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="910.082031" y="481.5"/>
-  <use xlink:href="#glyph1-11" x="915.082031" y="481.5"/>
-  <use xlink:href="#glyph1-9" x="921.419922" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="927.767578" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="932.767578" y="481.5"/>
-  <use xlink:href="#glyph1-10" x="937.767578" y="481.5"/>
-  <use xlink:href="#glyph1-16" x="943.265625" y="481.5"/>
-  <use xlink:href="#glyph1-13" x="949.383789" y="481.5"/>
-  <use xlink:href="#glyph1-17" x="955.72168" y="481.5"/>
-  <use xlink:href="#glyph1-7" x="962.069336" y="481.5"/>
-  <use xlink:href="#glyph1-4" x="967.069336" y="481.5"/>
-</g>
-</g>
-<g clip-path="url(#clip13)" clip-rule="nonzero">
-<g style="fill:rgb(0%,0%,0%);fill-opacity:0.724409;comp-op:src;clip-to-self:true;">
-  <use xlink:href="#glyph0-1" x="889.5" y="602.5"/>
-  <use xlink:href="#glyph0-2" x="898.87793" y="602.5"/>
-  <use xlink:href="#glyph0-3" x="909.301758" y="602.5"/>
-  <use xlink:href="#glyph0-4" x="919.954102" y="602.5"/>
-  <use xlink:href="#glyph0-5" x="931.40625" y="602.5"/>
-  <use xlink:href="#glyph0-6" x="942.858398" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="954.310547" y="602.5"/>
-  <use xlink:href="#glyph0-8" x="963.310547" y="602.5"/>
-  <use xlink:href="#glyph0-9" x="969.647461" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="981.073242" y="602.5"/>
-  <use xlink:href="#glyph0-1" x="990.073242" y="602.5"/>
-  <use xlink:href="#glyph0-10" x="999.451172" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="1009.347656" y="602.5"/>
-  <use xlink:href="#glyph0-11" x="1018.347656" y="602.5"/>
-  <use xlink:href="#glyph0-9" x="1029.755859" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="1041.181641" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="1050.181641" y="602.5"/>
-  <use xlink:href="#glyph0-10" x="1059.181641" y="602.5"/>
-  <use xlink:href="#glyph0-16" x="1069.078125" y="602.5"/>
-  <use xlink:href="#glyph0-13" x="1080.09082" y="602.5"/>
-  <use xlink:href="#glyph0-19" x="1091.499023" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="1102.924805" y="602.5"/>
-  <use xlink:href="#glyph0-4" x="1111.924805" y="602.5"/>
-  <use xlink:href="#glyph0-7" x="1123.376953" y="602.5"/>
-  <use xlink:href="#glyph0-6" x="1132.376953" y="602.5"/>
-</g>
-</g>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1542 728 L 1744 728 M 1542 362 L 1744 362 M 1542 362 L 1542 728 M 1744 362 L 1744 728 M 174 728 L 376 728 M 174 362 L 376 362 M 174 362 L 174 728 M 376 362 L 376 728 M 1279 728 L 1586 728 M 1279 362 L 1586 362 M 1279 362 L 1279 728 M 1586 362 L 1586 728 M 332 728 L 639 728 M 332 362 L 639 362 M 332 362 L 332 728 M 639 362 L 639 728 M 1016 728 L 1323 728 M 1016 362 L 1323 362 M 1016 362 L 1016 728 M 1323 362 L 1323 728 M 595 728 L 902 728 M 595 362 L 902 362 M 595 362 L 595 728 M 902 362 L 902 728 M 858 728 L 1060 728 M 858 362 L 1060 362 M 858 362 L 858 728 M 1060 362 L 1060 728 " 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 196 385 L 196 394 M 191 390 L 200 390 M 195 391 L 197 391 M 195 389 L 197 389 M 195 389 L 195 391 M 197 389 L 197 391 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1596.457031 558.128906 L 1586.996094 558.128906 L 1584.40625 565.5 L 1581.070312 565.5 L 1589.824219 540.960938 L 1593.863281 540.960938 L 1602.480469 565.5 L 1598.980469 565.5 Z M 1595.578125 555.503906 L 1591.808594 544.328125 L 1587.769531 555.503906 Z M 1595.578125 555.503906 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1581 536 L 1600 536 M 1581 516 L 1600 516 M 1581 516 L 1581 536 M 1600 516 L 1600 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 1581 536 L 1600 536 M 1581 516 L 1600 516 M 1600 536 L 1600 516 M 1581 536 L 1581 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1645.527344 594.875 L 1645.527344 604.5 L 1642.394531 604.5 L 1642.394531 594.875 L 1632.9375 579.960938 L 1636.808594 579.960938 L 1644.011719 591.910156 L 1651.011719 579.960938 L 1654.75 579.960938 Z M 1645.527344 594.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1633 497 L 1653 497 M 1633 477 L 1653 477 M 1633 477 L 1633 497 M 1653 477 L 1653 497 " 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 1633 497 L 1653 497 M 1633 477 L 1653 477 M 1653 497 L 1653 477 M 1633 497 L 1633 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1645.527344 516.875 L 1645.527344 526.5 L 1642.394531 526.5 L 1642.394531 516.875 L 1632.9375 501.960938 L 1636.808594 501.960938 L 1644.011719 513.910156 L 1651.011719 501.960938 L 1654.75 501.960938 Z M 1645.527344 516.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1633 574 L 1653 574 M 1633 555 L 1653 555 M 1633 555 L 1633 574 M 1653 555 L 1653 574 " 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 1633 574 L 1653 574 M 1633 555 L 1653 555 M 1653 574 L 1653 555 M 1633 574 L 1633 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1645.527344 555.875 L 1645.527344 565.5 L 1642.394531 565.5 L 1642.394531 555.875 L 1632.9375 540.960938 L 1636.808594 540.960938 L 1644.011719 552.910156 L 1651.011719 540.960938 L 1654.75 540.960938 Z M 1645.527344 555.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1633 536 L 1653 536 M 1633 516 L 1653 516 M 1633 516 L 1633 536 M 1653 516 L 1653 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 1633 536 L 1653 536 M 1633 516 L 1653 516 M 1653 536 L 1653 516 M 1633 536 L 1633 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1579.195312 385.5 L 1577.234375 385.5 L 1572.089844 371.1875 L 1574.050781 371.1875 L 1578.253906 383.300781 L 1582.222656 371.1875 L 1584.164062 371.1875 Z M 1579.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1596.691406 375.386719 L 1596.652344 376.015625 L 1596.554688 376.585938 L 1596.378906 377.117188 L 1596.160156 377.585938 L 1595.847656 378.019531 L 1595.496094 378.410156 L 1595.101562 378.746094 L 1594.6875 379 L 1594.238281 379.195312 L 1593.746094 379.335938 L 1593.234375 379.414062 L 1592.6875 379.433594 L 1588.191406 379.433594 L 1588.191406 385.5 L 1586.363281 385.5 L 1586.363281 371.1875 L 1592.273438 371.1875 L 1593.117188 371.246094 L 1593.882812 371.382812 L 1594.550781 371.617188 L 1595.140625 371.953125 L 1595.632812 372.363281 L 1596.042969 372.875 L 1596.242188 373.246094 L 1596.398438 373.621094 L 1596.515625 374.011719 L 1596.613281 374.445312 L 1596.671875 374.917969 Z M 1588.191406 377.824219 L 1592 377.824219 L 1592.53125 377.804688 L 1593 377.703125 L 1593.433594 377.566406 L 1593.804688 377.351562 L 1594.121094 377.078125 L 1594.394531 376.742188 L 1594.492188 376.546875 L 1594.589844 376.3125 L 1594.667969 376.09375 L 1594.730469 375.839844 L 1594.769531 375.585938 L 1594.789062 375.308594 L 1594.75 374.839844 L 1594.648438 374.40625 L 1594.492188 374.03125 L 1594.277344 373.699219 L 1593.984375 373.425781 L 1593.648438 373.1875 L 1593.414062 373.089844 L 1593.15625 372.992188 L 1592.882812 372.914062 L 1592.609375 372.855469 L 1592.3125 372.816406 L 1592 372.796875 L 1588.191406 372.796875 Z M 1588.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1609.886719 381.414062 L 1609.847656 382.042969 L 1609.75 382.613281 L 1609.574219 383.144531 L 1609.335938 383.613281 L 1609.023438 384.066406 L 1608.648438 384.460938 L 1608.238281 384.792969 L 1607.804688 385.046875 L 1607.316406 385.246094 L 1606.804688 385.402344 L 1606.253906 385.480469 L 1605.664062 385.5 L 1599.207031 385.5 L 1599.207031 371.1875 L 1605.015625 371.1875 L 1605.863281 371.246094 L 1606.609375 371.382812 L 1607.277344 371.617188 L 1607.84375 371.953125 L 1608.335938 372.382812 L 1608.730469 372.914062 L 1608.886719 373.207031 L 1609.023438 373.523438 L 1609.121094 373.816406 L 1609.199219 374.152344 L 1609.238281 374.484375 L 1609.257812 374.820312 L 1609.199219 375.523438 L 1609.023438 376.132812 L 1608.75 376.703125 L 1608.355469 377.175781 L 1607.863281 377.605469 L 1607.277344 377.941406 L 1607.84375 378.195312 L 1608.335938 378.46875 L 1608.769531 378.785156 L 1609.121094 379.136719 L 1609.394531 379.511719 L 1609.613281 379.902344 L 1609.691406 380.140625 L 1609.808594 380.609375 L 1609.847656 380.886719 L 1609.867188 381.140625 Z M 1607.433594 375.074219 L 1607.375 374.484375 L 1607.195312 373.992188 L 1606.921875 373.5625 L 1606.53125 373.246094 L 1606.039062 373.011719 L 1605.429688 372.855469 L 1605.292969 372.855469 L 1605.15625 372.835938 L 1605.015625 372.816406 L 1604.703125 372.816406 L 1604.566406 372.796875 L 1601.03125 372.796875 L 1601.03125 377.351562 L 1604.566406 377.351562 L 1605.292969 377.3125 L 1605.921875 377.195312 L 1606.449219 376.976562 L 1606.84375 376.683594 L 1607.15625 376.292969 L 1607.355469 375.820312 L 1607.375 375.722656 L 1607.394531 375.605469 L 1607.414062 375.484375 L 1607.414062 375.210938 Z M 1605.488281 383.890625 L 1606.039062 383.871094 L 1606.53125 383.753906 L 1606.960938 383.554688 L 1607.316406 383.300781 L 1607.609375 382.96875 L 1607.84375 382.554688 L 1607.902344 382.398438 L 1607.941406 382.222656 L 1608.003906 382.023438 L 1608.023438 381.847656 L 1608.042969 381.652344 L 1608.0625 381.433594 L 1608.023438 381.003906 L 1607.941406 380.589844 L 1607.804688 380.238281 L 1607.609375 379.902344 L 1607.355469 379.628906 L 1607.058594 379.375 L 1606.84375 379.257812 L 1606.609375 379.15625 L 1606.351562 379.078125 L 1606.078125 379.019531 L 1605.785156 378.980469 L 1605.488281 378.960938 L 1601.03125 378.960938 L 1601.03125 383.890625 Z M 1605.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1581 711 L 1600 711 M 1581 691 L 1600 691 M 1581 691 L 1581 711 M 1600 691 L 1600 711 " 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 1581 711 L 1600 711 M 1581 691 L 1600 691 M 1600 711 L 1600 691 M 1581 711 L 1581 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1579.195312 696.5 L 1577.234375 696.5 L 1572.089844 682.1875 L 1574.050781 682.1875 L 1578.253906 694.300781 L 1582.222656 682.1875 L 1584.164062 682.1875 Z M 1579.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1597.261719 682.1875 L 1597.261719 696.5 L 1595.199219 696.5 L 1587.796875 684.894531 L 1587.796875 696.5 L 1586.070312 696.5 L 1586.070312 682.1875 L 1588.050781 682.1875 L 1595.535156 693.886719 L 1595.535156 682.1875 Z M 1597.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1610.96875 692.414062 L 1610.929688 693.042969 L 1610.828125 693.613281 L 1610.652344 694.144531 L 1610.417969 694.613281 L 1610.101562 695.066406 L 1609.730469 695.460938 L 1609.316406 695.792969 L 1608.886719 696.046875 L 1608.394531 696.246094 L 1607.882812 696.402344 L 1607.335938 696.480469 L 1606.746094 696.5 L 1600.285156 696.5 L 1600.285156 682.1875 L 1606.097656 682.1875 L 1606.941406 682.246094 L 1607.6875 682.382812 L 1608.355469 682.617188 L 1608.925781 682.953125 L 1609.414062 683.382812 L 1609.808594 683.914062 L 1609.964844 684.207031 L 1610.101562 684.523438 L 1610.203125 684.816406 L 1610.28125 685.152344 L 1610.320312 685.484375 L 1610.339844 685.820312 L 1610.28125 686.523438 L 1610.101562 687.132812 L 1609.828125 687.703125 L 1609.433594 688.175781 L 1608.945312 688.605469 L 1608.355469 688.941406 L 1608.925781 689.195312 L 1609.414062 689.46875 L 1609.847656 689.785156 L 1610.203125 690.136719 L 1610.476562 690.511719 L 1610.691406 690.902344 L 1610.769531 691.140625 L 1610.886719 691.609375 L 1610.929688 691.886719 L 1610.949219 692.140625 Z M 1608.511719 686.074219 L 1608.453125 685.484375 L 1608.277344 684.992188 L 1608.003906 684.5625 L 1607.609375 684.246094 L 1607.117188 684.011719 L 1606.511719 683.855469 L 1606.371094 683.855469 L 1606.097656 683.816406 L 1605.785156 683.816406 L 1605.644531 683.796875 L 1602.113281 683.796875 L 1602.113281 688.351562 L 1605.644531 688.351562 L 1606.371094 688.3125 L 1607 688.195312 L 1607.53125 687.976562 L 1607.921875 687.683594 L 1608.238281 687.292969 L 1608.433594 686.820312 L 1608.453125 686.722656 L 1608.472656 686.605469 L 1608.492188 686.484375 L 1608.492188 686.210938 Z M 1606.570312 694.890625 L 1607.117188 694.871094 L 1607.609375 694.753906 L 1608.042969 694.554688 L 1608.394531 694.300781 L 1608.6875 693.96875 L 1608.925781 693.554688 L 1608.984375 693.398438 L 1609.023438 693.222656 L 1609.082031 693.023438 L 1609.101562 692.847656 L 1609.121094 692.652344 L 1609.140625 692.433594 L 1609.101562 692.003906 L 1609.023438 691.589844 L 1608.886719 691.238281 L 1608.6875 690.902344 L 1608.433594 690.628906 L 1608.140625 690.375 L 1607.921875 690.257812 L 1607.6875 690.15625 L 1607.433594 690.078125 L 1607.15625 690.019531 L 1606.863281 689.980469 L 1606.570312 689.960938 L 1602.113281 689.960938 L 1602.113281 694.890625 Z M 1606.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1581 380 L 1581 399 M 1600 380 L 1600 399 " 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 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1600 399 L 1600 380 M 1581 399 L 1581 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1570.195312 385.5 L 1568.234375 385.5 L 1563.089844 371.1875 L 1565.050781 371.1875 L 1569.253906 383.300781 L 1573.222656 371.1875 L 1575.164062 371.1875 Z M 1570.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1587.691406 375.386719 L 1587.652344 376.015625 L 1587.554688 376.585938 L 1587.378906 377.117188 L 1587.160156 377.585938 L 1586.847656 378.019531 L 1586.496094 378.410156 L 1586.101562 378.746094 L 1585.6875 379 L 1585.238281 379.195312 L 1584.746094 379.335938 L 1584.234375 379.414062 L 1583.6875 379.433594 L 1579.191406 379.433594 L 1579.191406 385.5 L 1577.363281 385.5 L 1577.363281 371.1875 L 1583.273438 371.1875 L 1584.117188 371.246094 L 1584.882812 371.382812 L 1585.550781 371.617188 L 1586.140625 371.953125 L 1586.632812 372.363281 L 1587.042969 372.875 L 1587.242188 373.246094 L 1587.398438 373.621094 L 1587.515625 374.011719 L 1587.613281 374.445312 L 1587.671875 374.917969 Z M 1579.191406 377.824219 L 1583 377.824219 L 1583.53125 377.804688 L 1584 377.703125 L 1584.433594 377.566406 L 1584.804688 377.351562 L 1585.121094 377.078125 L 1585.394531 376.742188 L 1585.492188 376.546875 L 1585.589844 376.3125 L 1585.667969 376.09375 L 1585.730469 375.839844 L 1585.769531 375.585938 L 1585.789062 375.308594 L 1585.75 374.839844 L 1585.648438 374.40625 L 1585.492188 374.03125 L 1585.277344 373.699219 L 1584.984375 373.425781 L 1584.648438 373.1875 L 1584.414062 373.089844 L 1584.15625 372.992188 L 1583.882812 372.914062 L 1583.609375 372.855469 L 1583.3125 372.816406 L 1583 372.796875 L 1579.191406 372.796875 Z M 1579.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1603.261719 385.5 L 1601.261719 385.5 L 1597.960938 373.738281 L 1594.761719 385.5 L 1592.757812 385.5 L 1589.085938 371.1875 L 1591.128906 371.1875 L 1593.820312 382.808594 L 1597 371.1875 L 1598.960938 371.1875 L 1602.222656 382.808594 L 1604.851562 371.1875 L 1606.894531 371.1875 Z M 1603.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1617.695312 378.429688 L 1618.148438 378.6875 L 1618.558594 378.960938 L 1618.914062 379.277344 L 1619.1875 379.648438 L 1619.382812 380.042969 L 1619.539062 380.472656 L 1619.621094 380.964844 L 1619.640625 381.257812 L 1619.660156 381.59375 L 1619.660156 382.378906 L 1619.640625 382.789062 L 1619.660156 383.144531 L 1619.679688 383.457031 L 1619.71875 383.734375 L 1619.757812 383.96875 L 1619.835938 384.164062 L 1619.894531 384.359375 L 1619.992188 384.519531 L 1620.089844 384.675781 L 1620.207031 384.8125 L 1620.347656 384.949219 L 1620.503906 385.046875 L 1620.503906 385.5 L 1618.285156 385.5 L 1618.167969 385.1875 L 1618.066406 384.851562 L 1617.988281 384.460938 L 1617.929688 384.066406 L 1617.890625 383.632812 L 1617.890625 381.886719 L 1617.851562 381.316406 L 1617.753906 380.808594 L 1617.597656 380.375 L 1617.359375 380.023438 L 1617.066406 379.746094 L 1616.714844 379.53125 L 1616.535156 379.472656 L 1616.359375 379.433594 L 1616.164062 379.394531 L 1615.96875 379.375 L 1615.75 379.355469 L 1615.535156 379.335938 L 1610.824219 379.335938 L 1610.824219 385.5 L 1608.996094 385.5 L 1608.996094 371.1875 L 1615.59375 371.1875 L 1616.476562 371.246094 L 1617.28125 371.382812 L 1617.96875 371.636719 L 1618.558594 371.972656 L 1619.050781 372.402344 L 1619.441406 372.933594 L 1619.578125 373.246094 L 1619.71875 373.5625 L 1619.816406 373.894531 L 1619.894531 374.25 L 1619.933594 374.621094 L 1619.953125 375.015625 L 1619.914062 375.542969 L 1619.835938 376.035156 L 1619.699219 376.488281 L 1619.5 376.898438 L 1619.265625 377.273438 L 1618.972656 377.585938 L 1618.792969 377.742188 L 1618.597656 377.902344 L 1618.402344 378.039062 L 1618.1875 378.175781 L 1617.949219 378.3125 Z M 1618.046875 375.269531 L 1617.988281 374.679688 L 1617.871094 374.171875 L 1617.636719 373.738281 L 1617.339844 373.386719 L 1616.929688 373.128906 L 1616.457031 372.933594 L 1616.28125 372.894531 L 1616.085938 372.855469 L 1615.886719 372.835938 L 1615.671875 372.816406 L 1615.457031 372.816406 L 1615.242188 372.796875 L 1610.824219 372.796875 L 1610.824219 377.722656 L 1615.242188 377.722656 L 1615.886719 377.703125 L 1616.457031 377.585938 L 1616.929688 377.410156 L 1617.320312 377.15625 L 1617.636719 376.839844 L 1617.851562 376.449219 L 1617.910156 376.292969 L 1617.949219 376.09375 L 1617.988281 375.917969 L 1618.007812 375.703125 L 1618.027344 375.503906 Z M 1618.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1581 711 L 1600 711 M 1581 691 L 1600 691 M 1581 691 L 1581 711 M 1600 691 L 1600 711 " 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 1581 711 L 1600 711 M 1581 691 L 1600 691 M 1600 711 L 1600 691 M 1581 711 L 1581 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1571.195312 697.046875 L 1569.234375 697.046875 L 1564.089844 682.734375 L 1566.050781 682.734375 L 1570.253906 694.847656 L 1574.222656 682.734375 L 1576.164062 682.734375 Z M 1571.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1579.265625 689.941406 L 1579.285156 690.609375 L 1579.347656 691.234375 L 1579.464844 691.824219 L 1579.621094 692.414062 L 1579.835938 692.964844 L 1580.113281 693.476562 L 1580.582031 694.203125 L 1581.152344 694.789062 L 1581.800781 695.261719 L 1582.527344 695.59375 L 1583.351562 695.8125 L 1584.253906 695.890625 L 1584.390625 695.890625 L 1585 695.871094 L 1585.589844 695.773438 L 1586.121094 695.59375 L 1586.628906 695.378906 L 1587.101562 695.085938 L 1587.554688 694.710938 L 1587.925781 694.320312 L 1588.242188 693.886719 L 1588.496094 693.394531 L 1588.671875 692.886719 L 1588.789062 692.335938 L 1588.867188 691.746094 L 1588.867188 691.550781 L 1588.886719 691.492188 L 1588.886719 691.097656 L 1584.53125 691.097656 L 1584.53125 689.488281 L 1590.5 689.488281 L 1590.5 697.125 L 1589.339844 697.125 L 1588.886719 695.222656 L 1588.261719 695.851562 L 1587.59375 696.378906 L 1586.90625 696.8125 L 1586.179688 697.105469 L 1585.433594 697.324219 L 1584.667969 697.460938 L 1584.429688 697.460938 L 1584.332031 697.480469 L 1584.097656 697.480469 L 1584 697.5 L 1583.175781 697.441406 L 1582.390625 697.304688 L 1581.644531 697.085938 L 1580.957031 696.773438 L 1580.308594 696.359375 L 1579.699219 695.851562 L 1579.148438 695.300781 L 1578.679688 694.671875 L 1578.285156 694.003906 L 1577.972656 693.257812 L 1577.714844 692.453125 L 1577.558594 691.589844 L 1577.519531 691.355469 L 1577.480469 691.097656 L 1577.460938 690.84375 L 1577.441406 690.570312 L 1577.441406 690.039062 L 1577.460938 689.3125 L 1577.539062 688.605469 L 1577.65625 687.917969 L 1577.851562 687.25 L 1578.070312 686.601562 L 1578.363281 685.953125 L 1578.855469 685.128906 L 1579.425781 684.402344 L 1580.113281 683.792969 L 1580.859375 683.304688 L 1581.703125 682.929688 L 1582.644531 682.65625 L 1582.898438 682.617188 L 1583.175781 682.578125 L 1583.449219 682.558594 L 1583.722656 682.519531 L 1584.019531 682.519531 L 1584.3125 682.5 L 1585.257812 682.558594 L 1586.140625 682.695312 L 1586.945312 682.929688 L 1587.671875 683.265625 L 1588.320312 683.695312 L 1588.90625 684.207031 L 1589.242188 684.597656 L 1589.535156 685.03125 L 1589.792969 685.503906 L 1590.007812 685.992188 L 1590.164062 686.523438 L 1590.300781 687.074219 L 1588.4375 687.074219 L 1588.28125 686.5625 L 1588.082031 686.09375 L 1587.808594 685.660156 L 1587.496094 685.285156 L 1587.101562 684.953125 L 1586.667969 684.660156 L 1586.316406 684.5 L 1585.941406 684.363281 L 1585.550781 684.246094 L 1585.15625 684.1875 L 1584.726562 684.128906 L 1584.292969 684.109375 L 1583.566406 684.167969 L 1582.898438 684.285156 L 1582.292969 684.480469 L 1581.722656 684.777344 L 1581.191406 685.148438 L 1580.71875 685.601562 L 1580.289062 686.152344 L 1579.933594 686.757812 L 1579.660156 687.425781 L 1579.445312 688.152344 L 1579.304688 688.9375 L 1579.265625 689.785156 Z M 1579.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1604.519531 682.734375 L 1604.519531 697.046875 L 1602.457031 697.046875 L 1595.054688 685.445312 L 1595.054688 697.046875 L 1593.324219 697.046875 L 1593.324219 682.734375 L 1595.308594 682.734375 L 1602.789062 694.4375 L 1602.789062 682.734375 Z M 1604.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1607.738281 697.046875 L 1607.738281 682.734375 L 1613.257812 682.734375 L 1614.121094 682.792969 L 1614.925781 682.949219 L 1615.671875 683.226562 L 1616.359375 683.578125 L 1616.96875 684.070312 L 1617.535156 684.640625 L 1618.007812 685.324219 L 1618.402344 686.070312 L 1618.695312 686.917969 L 1618.910156 687.820312 L 1619.027344 688.820312 L 1619.085938 689.882812 L 1619.027344 691 L 1618.890625 692.042969 L 1618.65625 692.984375 L 1618.339844 693.847656 L 1617.929688 694.613281 L 1617.417969 695.28125 L 1616.867188 695.832031 L 1616.261719 696.261719 L 1615.59375 696.617188 L 1614.867188 696.851562 L 1614.082031 697.007812 L 1613.257812 697.046875 Z M 1609.566406 695.4375 L 1612.941406 695.4375 L 1613.84375 695.378906 L 1614.648438 695.164062 L 1615.355469 694.789062 L 1615.945312 694.300781 L 1616.417969 693.632812 L 1616.808594 692.828125 L 1616.929688 692.414062 L 1617.046875 691.984375 L 1617.144531 691.511719 L 1617.203125 691 L 1617.242188 690.46875 L 1617.261719 689.902344 L 1617.183594 688.625 L 1616.988281 687.503906 L 1616.632812 686.542969 L 1616.160156 685.777344 L 1615.554688 685.148438 L 1614.808594 684.699219 L 1614.53125 684.597656 L 1614.238281 684.5 L 1613.921875 684.441406 L 1613.609375 684.382812 L 1613.277344 684.363281 L 1612.941406 684.34375 L 1609.566406 684.34375 Z M 1609.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1581 380 L 1581 399 M 1600 380 L 1600 399 " 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 1581 399 L 1600 399 M 1581 380 L 1600 380 M 1600 399 L 1600 380 M 1581 399 L 1581 380 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1564 387 L 1564 392 M 1561 390 L 1566 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 333.457031 558.128906 L 323.996094 558.128906 L 321.40625 565.5 L 318.070312 565.5 L 326.824219 540.960938 L 330.863281 540.960938 L 339.480469 565.5 L 335.980469 565.5 Z M 332.578125 555.503906 L 328.808594 544.328125 L 324.769531 555.503906 Z M 332.578125 555.503906 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 536 L 337 536 M 318 516 L 337 516 M 318 516 L 318 536 M 337 516 L 337 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 318 536 L 337 536 M 318 516 L 337 516 M 337 536 L 337 516 M 318 536 L 318 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 277.527344 594.875 L 277.527344 604.5 L 274.394531 604.5 L 274.394531 594.875 L 264.9375 579.960938 L 268.808594 579.960938 L 276.011719 591.910156 L 283.011719 579.960938 L 286.75 579.960938 Z M 277.527344 594.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 265 497 L 285 497 M 265 477 L 285 477 M 265 477 L 265 497 M 285 477 L 285 497 " 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 265 497 L 285 497 M 265 477 L 285 477 M 285 497 L 285 477 M 265 497 L 265 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 277.527344 516.875 L 277.527344 526.5 L 274.394531 526.5 L 274.394531 516.875 L 264.9375 501.960938 L 268.808594 501.960938 L 276.011719 513.910156 L 283.011719 501.960938 L 286.75 501.960938 Z M 277.527344 516.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 265 574 L 285 574 M 265 555 L 285 555 M 265 555 L 265 574 M 285 555 L 285 574 " 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 265 574 L 285 574 M 265 555 L 285 555 M 285 574 L 285 555 M 265 574 L 265 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 277.527344 555.875 L 277.527344 565.5 L 274.394531 565.5 L 274.394531 555.875 L 264.9375 540.960938 L 268.808594 540.960938 L 276.011719 552.910156 L 283.011719 540.960938 L 286.75 540.960938 Z M 277.527344 555.875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 265 536 L 285 536 M 265 516 L 285 516 M 265 516 L 265 536 M 285 516 L 285 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 265 536 L 285 536 M 265 516 L 285 516 M 285 536 L 285 516 M 265 536 L 265 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 316.195312 385.5 L 314.234375 385.5 L 309.089844 371.1875 L 311.050781 371.1875 L 315.253906 383.300781 L 319.222656 371.1875 L 321.164062 371.1875 Z M 316.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 333.691406 375.386719 L 333.652344 376.015625 L 333.554688 376.585938 L 333.378906 377.117188 L 333.160156 377.585938 L 332.847656 378.019531 L 332.496094 378.410156 L 332.101562 378.746094 L 331.6875 379 L 331.238281 379.195312 L 330.746094 379.335938 L 330.234375 379.414062 L 329.6875 379.433594 L 325.191406 379.433594 L 325.191406 385.5 L 323.363281 385.5 L 323.363281 371.1875 L 329.273438 371.1875 L 330.117188 371.246094 L 330.882812 371.382812 L 331.550781 371.617188 L 332.140625 371.953125 L 332.632812 372.363281 L 333.042969 372.875 L 333.242188 373.246094 L 333.398438 373.621094 L 333.515625 374.011719 L 333.613281 374.445312 L 333.671875 374.917969 Z M 325.191406 377.824219 L 329 377.824219 L 329.53125 377.804688 L 330 377.703125 L 330.433594 377.566406 L 330.804688 377.351562 L 331.121094 377.078125 L 331.394531 376.742188 L 331.492188 376.546875 L 331.589844 376.3125 L 331.667969 376.09375 L 331.730469 375.839844 L 331.769531 375.585938 L 331.789062 375.308594 L 331.75 374.839844 L 331.648438 374.40625 L 331.492188 374.03125 L 331.277344 373.699219 L 330.984375 373.425781 L 330.648438 373.1875 L 330.414062 373.089844 L 330.15625 372.992188 L 329.882812 372.914062 L 329.609375 372.855469 L 329.3125 372.816406 L 329 372.796875 L 325.191406 372.796875 Z M 325.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 346.886719 381.414062 L 346.847656 382.042969 L 346.75 382.613281 L 346.574219 383.144531 L 346.335938 383.613281 L 346.023438 384.066406 L 345.648438 384.460938 L 345.238281 384.792969 L 344.804688 385.046875 L 344.316406 385.246094 L 343.804688 385.402344 L 343.253906 385.480469 L 342.664062 385.5 L 336.207031 385.5 L 336.207031 371.1875 L 342.015625 371.1875 L 342.863281 371.246094 L 343.609375 371.382812 L 344.277344 371.617188 L 344.84375 371.953125 L 345.335938 372.382812 L 345.730469 372.914062 L 345.886719 373.207031 L 346.023438 373.523438 L 346.121094 373.816406 L 346.199219 374.152344 L 346.238281 374.484375 L 346.257812 374.820312 L 346.199219 375.523438 L 346.023438 376.132812 L 345.75 376.703125 L 345.355469 377.175781 L 344.863281 377.605469 L 344.277344 377.941406 L 344.84375 378.195312 L 345.335938 378.46875 L 345.769531 378.785156 L 346.121094 379.136719 L 346.394531 379.511719 L 346.613281 379.902344 L 346.691406 380.140625 L 346.808594 380.609375 L 346.847656 380.886719 L 346.867188 381.140625 Z M 344.433594 375.074219 L 344.375 374.484375 L 344.195312 373.992188 L 343.921875 373.5625 L 343.53125 373.246094 L 343.039062 373.011719 L 342.429688 372.855469 L 342.292969 372.855469 L 342.15625 372.835938 L 342.015625 372.816406 L 341.703125 372.816406 L 341.566406 372.796875 L 338.03125 372.796875 L 338.03125 377.351562 L 341.566406 377.351562 L 342.292969 377.3125 L 342.921875 377.195312 L 343.449219 376.976562 L 343.84375 376.683594 L 344.15625 376.292969 L 344.355469 375.820312 L 344.375 375.722656 L 344.394531 375.605469 L 344.414062 375.484375 L 344.414062 375.210938 Z M 342.488281 383.890625 L 343.039062 383.871094 L 343.53125 383.753906 L 343.960938 383.554688 L 344.316406 383.300781 L 344.609375 382.96875 L 344.84375 382.554688 L 344.902344 382.398438 L 344.941406 382.222656 L 345.003906 382.023438 L 345.023438 381.847656 L 345.042969 381.652344 L 345.0625 381.433594 L 345.023438 381.003906 L 344.941406 380.589844 L 344.804688 380.238281 L 344.609375 379.902344 L 344.355469 379.628906 L 344.058594 379.375 L 343.84375 379.257812 L 343.609375 379.15625 L 343.351562 379.078125 L 343.078125 379.019531 L 342.785156 378.980469 L 342.488281 378.960938 L 338.03125 378.960938 L 338.03125 383.890625 Z M 342.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 711 L 337 711 M 318 691 L 337 691 M 318 691 L 318 711 M 337 691 L 337 711 " 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 318 711 L 337 711 M 318 691 L 337 691 M 337 711 L 337 691 M 318 711 L 318 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 316.195312 696.5 L 314.234375 696.5 L 309.089844 682.1875 L 311.050781 682.1875 L 315.253906 694.300781 L 319.222656 682.1875 L 321.164062 682.1875 Z M 316.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 334.261719 682.1875 L 334.261719 696.5 L 332.199219 696.5 L 324.796875 684.894531 L 324.796875 696.5 L 323.070312 696.5 L 323.070312 682.1875 L 325.050781 682.1875 L 332.535156 693.886719 L 332.535156 682.1875 Z M 334.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 347.96875 692.414062 L 347.929688 693.042969 L 347.828125 693.613281 L 347.652344 694.144531 L 347.417969 694.613281 L 347.101562 695.066406 L 346.730469 695.460938 L 346.316406 695.792969 L 345.886719 696.046875 L 345.394531 696.246094 L 344.882812 696.402344 L 344.335938 696.480469 L 343.746094 696.5 L 337.285156 696.5 L 337.285156 682.1875 L 343.097656 682.1875 L 343.941406 682.246094 L 344.6875 682.382812 L 345.355469 682.617188 L 345.925781 682.953125 L 346.414062 683.382812 L 346.808594 683.914062 L 346.964844 684.207031 L 347.101562 684.523438 L 347.203125 684.816406 L 347.28125 685.152344 L 347.320312 685.484375 L 347.339844 685.820312 L 347.28125 686.523438 L 347.101562 687.132812 L 346.828125 687.703125 L 346.433594 688.175781 L 345.945312 688.605469 L 345.355469 688.941406 L 345.925781 689.195312 L 346.414062 689.46875 L 346.847656 689.785156 L 347.203125 690.136719 L 347.476562 690.511719 L 347.691406 690.902344 L 347.769531 691.140625 L 347.886719 691.609375 L 347.929688 691.886719 L 347.949219 692.140625 Z M 345.511719 686.074219 L 345.453125 685.484375 L 345.277344 684.992188 L 345.003906 684.5625 L 344.609375 684.246094 L 344.117188 684.011719 L 343.511719 683.855469 L 343.371094 683.855469 L 343.097656 683.816406 L 342.785156 683.816406 L 342.644531 683.796875 L 339.113281 683.796875 L 339.113281 688.351562 L 342.644531 688.351562 L 343.371094 688.3125 L 344 688.195312 L 344.53125 687.976562 L 344.921875 687.683594 L 345.238281 687.292969 L 345.433594 686.820312 L 345.453125 686.722656 L 345.472656 686.605469 L 345.492188 686.484375 L 345.492188 686.210938 Z M 343.570312 694.890625 L 344.117188 694.871094 L 344.609375 694.753906 L 345.042969 694.554688 L 345.394531 694.300781 L 345.6875 693.96875 L 345.925781 693.554688 L 345.984375 693.398438 L 346.023438 693.222656 L 346.082031 693.023438 L 346.101562 692.847656 L 346.121094 692.652344 L 346.140625 692.433594 L 346.101562 692.003906 L 346.023438 691.589844 L 345.886719 691.238281 L 345.6875 690.902344 L 345.433594 690.628906 L 345.140625 690.375 L 344.921875 690.257812 L 344.6875 690.15625 L 344.433594 690.078125 L 344.15625 690.019531 L 343.863281 689.980469 L 343.570312 689.960938 L 339.113281 689.960938 L 339.113281 694.890625 Z M 343.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 399 L 337 399 M 318 380 L 337 380 M 318 380 L 318 399 M 337 380 L 337 399 " 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 318 399 L 337 399 M 318 380 L 337 380 M 337 399 L 337 380 M 318 399 L 318 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 307.195312 385.5 L 305.234375 385.5 L 300.089844 371.1875 L 302.050781 371.1875 L 306.253906 383.300781 L 310.222656 371.1875 L 312.164062 371.1875 Z M 307.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 324.691406 375.386719 L 324.652344 376.015625 L 324.554688 376.585938 L 324.378906 377.117188 L 324.160156 377.585938 L 323.847656 378.019531 L 323.496094 378.410156 L 323.101562 378.746094 L 322.6875 379 L 322.238281 379.195312 L 321.746094 379.335938 L 321.234375 379.414062 L 320.6875 379.433594 L 316.191406 379.433594 L 316.191406 385.5 L 314.363281 385.5 L 314.363281 371.1875 L 320.273438 371.1875 L 321.117188 371.246094 L 321.882812 371.382812 L 322.550781 371.617188 L 323.140625 371.953125 L 323.632812 372.363281 L 324.042969 372.875 L 324.242188 373.246094 L 324.398438 373.621094 L 324.515625 374.011719 L 324.613281 374.445312 L 324.671875 374.917969 Z M 316.191406 377.824219 L 320 377.824219 L 320.53125 377.804688 L 321 377.703125 L 321.433594 377.566406 L 321.804688 377.351562 L 322.121094 377.078125 L 322.394531 376.742188 L 322.492188 376.546875 L 322.589844 376.3125 L 322.667969 376.09375 L 322.730469 375.839844 L 322.769531 375.585938 L 322.789062 375.308594 L 322.75 374.839844 L 322.648438 374.40625 L 322.492188 374.03125 L 322.277344 373.699219 L 321.984375 373.425781 L 321.648438 373.1875 L 321.414062 373.089844 L 321.15625 372.992188 L 320.882812 372.914062 L 320.609375 372.855469 L 320.3125 372.816406 L 320 372.796875 L 316.191406 372.796875 Z M 316.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 340.261719 385.5 L 338.261719 385.5 L 334.960938 373.738281 L 331.761719 385.5 L 329.757812 385.5 L 326.085938 371.1875 L 328.128906 371.1875 L 330.820312 382.808594 L 334 371.1875 L 335.960938 371.1875 L 339.222656 382.808594 L 341.851562 371.1875 L 343.894531 371.1875 Z M 340.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 354.695312 378.429688 L 355.148438 378.6875 L 355.558594 378.960938 L 355.914062 379.277344 L 356.1875 379.648438 L 356.382812 380.042969 L 356.539062 380.472656 L 356.621094 380.964844 L 356.640625 381.257812 L 356.660156 381.59375 L 356.660156 382.378906 L 356.640625 382.789062 L 356.660156 383.144531 L 356.679688 383.457031 L 356.71875 383.734375 L 356.757812 383.96875 L 356.835938 384.164062 L 356.894531 384.359375 L 356.992188 384.519531 L 357.089844 384.675781 L 357.207031 384.8125 L 357.347656 384.949219 L 357.503906 385.046875 L 357.503906 385.5 L 355.285156 385.5 L 355.167969 385.1875 L 355.066406 384.851562 L 354.988281 384.460938 L 354.929688 384.066406 L 354.890625 383.632812 L 354.890625 381.886719 L 354.851562 381.316406 L 354.753906 380.808594 L 354.597656 380.375 L 354.359375 380.023438 L 354.066406 379.746094 L 353.714844 379.53125 L 353.535156 379.472656 L 353.359375 379.433594 L 353.164062 379.394531 L 352.96875 379.375 L 352.75 379.355469 L 352.535156 379.335938 L 347.824219 379.335938 L 347.824219 385.5 L 345.996094 385.5 L 345.996094 371.1875 L 352.59375 371.1875 L 353.476562 371.246094 L 354.28125 371.382812 L 354.96875 371.636719 L 355.558594 371.972656 L 356.050781 372.402344 L 356.441406 372.933594 L 356.578125 373.246094 L 356.71875 373.5625 L 356.816406 373.894531 L 356.894531 374.25 L 356.933594 374.621094 L 356.953125 375.015625 L 356.914062 375.542969 L 356.835938 376.035156 L 356.699219 376.488281 L 356.5 376.898438 L 356.265625 377.273438 L 355.972656 377.585938 L 355.792969 377.742188 L 355.597656 377.902344 L 355.402344 378.039062 L 355.1875 378.175781 L 354.949219 378.3125 Z M 355.046875 375.269531 L 354.988281 374.679688 L 354.871094 374.171875 L 354.636719 373.738281 L 354.339844 373.386719 L 353.929688 373.128906 L 353.457031 372.933594 L 353.28125 372.894531 L 353.085938 372.855469 L 352.886719 372.835938 L 352.671875 372.816406 L 352.457031 372.816406 L 352.242188 372.796875 L 347.824219 372.796875 L 347.824219 377.722656 L 352.242188 377.722656 L 352.886719 377.703125 L 353.457031 377.585938 L 353.929688 377.410156 L 354.320312 377.15625 L 354.636719 376.839844 L 354.851562 376.449219 L 354.910156 376.292969 L 354.949219 376.09375 L 354.988281 375.917969 L 355.007812 375.703125 L 355.027344 375.503906 Z M 355.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 711 L 337 711 M 318 691 L 337 691 M 318 691 L 318 711 M 337 691 L 337 711 " 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 318 711 L 337 711 M 318 691 L 337 691 M 337 711 L 337 691 M 318 711 L 318 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 308.195312 697.046875 L 306.234375 697.046875 L 301.089844 682.734375 L 303.050781 682.734375 L 307.253906 694.847656 L 311.222656 682.734375 L 313.164062 682.734375 Z M 308.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 316.265625 689.941406 L 316.285156 690.609375 L 316.347656 691.234375 L 316.464844 691.824219 L 316.621094 692.414062 L 316.835938 692.964844 L 317.113281 693.476562 L 317.582031 694.203125 L 318.152344 694.789062 L 318.800781 695.261719 L 319.527344 695.59375 L 320.351562 695.8125 L 321.253906 695.890625 L 321.390625 695.890625 L 322 695.871094 L 322.589844 695.773438 L 323.121094 695.59375 L 323.628906 695.378906 L 324.101562 695.085938 L 324.554688 694.710938 L 324.925781 694.320312 L 325.242188 693.886719 L 325.496094 693.394531 L 325.671875 692.886719 L 325.789062 692.335938 L 325.867188 691.746094 L 325.867188 691.550781 L 325.886719 691.492188 L 325.886719 691.097656 L 321.53125 691.097656 L 321.53125 689.488281 L 327.5 689.488281 L 327.5 697.125 L 326.339844 697.125 L 325.886719 695.222656 L 325.261719 695.851562 L 324.59375 696.378906 L 323.90625 696.8125 L 323.179688 697.105469 L 322.433594 697.324219 L 321.667969 697.460938 L 321.429688 697.460938 L 321.332031 697.480469 L 321.097656 697.480469 L 321 697.5 L 320.175781 697.441406 L 319.390625 697.304688 L 318.644531 697.085938 L 317.957031 696.773438 L 317.308594 696.359375 L 316.699219 695.851562 L 316.148438 695.300781 L 315.679688 694.671875 L 315.285156 694.003906 L 314.972656 693.257812 L 314.714844 692.453125 L 314.558594 691.589844 L 314.519531 691.355469 L 314.480469 691.097656 L 314.460938 690.84375 L 314.441406 690.570312 L 314.441406 690.039062 L 314.460938 689.3125 L 314.539062 688.605469 L 314.65625 687.917969 L 314.851562 687.25 L 315.070312 686.601562 L 315.363281 685.953125 L 315.855469 685.128906 L 316.425781 684.402344 L 317.113281 683.792969 L 317.859375 683.304688 L 318.703125 682.929688 L 319.644531 682.65625 L 319.898438 682.617188 L 320.175781 682.578125 L 320.449219 682.558594 L 320.722656 682.519531 L 321.019531 682.519531 L 321.3125 682.5 L 322.257812 682.558594 L 323.140625 682.695312 L 323.945312 682.929688 L 324.671875 683.265625 L 325.320312 683.695312 L 325.90625 684.207031 L 326.242188 684.597656 L 326.535156 685.03125 L 326.792969 685.503906 L 327.007812 685.992188 L 327.164062 686.523438 L 327.300781 687.074219 L 325.4375 687.074219 L 325.28125 686.5625 L 325.082031 686.09375 L 324.808594 685.660156 L 324.496094 685.285156 L 324.101562 684.953125 L 323.667969 684.660156 L 323.316406 684.5 L 322.941406 684.363281 L 322.550781 684.246094 L 322.15625 684.1875 L 321.726562 684.128906 L 321.292969 684.109375 L 320.566406 684.167969 L 319.898438 684.285156 L 319.292969 684.480469 L 318.722656 684.777344 L 318.191406 685.148438 L 317.71875 685.601562 L 317.289062 686.152344 L 316.933594 686.757812 L 316.660156 687.425781 L 316.445312 688.152344 L 316.304688 688.9375 L 316.265625 689.785156 Z M 316.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 341.519531 682.734375 L 341.519531 697.046875 L 339.457031 697.046875 L 332.054688 685.445312 L 332.054688 697.046875 L 330.324219 697.046875 L 330.324219 682.734375 L 332.308594 682.734375 L 339.789062 694.4375 L 339.789062 682.734375 Z M 341.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 344.738281 697.046875 L 344.738281 682.734375 L 350.257812 682.734375 L 351.121094 682.792969 L 351.925781 682.949219 L 352.671875 683.226562 L 353.359375 683.578125 L 353.96875 684.070312 L 354.535156 684.640625 L 355.007812 685.324219 L 355.402344 686.070312 L 355.695312 686.917969 L 355.910156 687.820312 L 356.027344 688.820312 L 356.085938 689.882812 L 356.027344 691 L 355.890625 692.042969 L 355.65625 692.984375 L 355.339844 693.847656 L 354.929688 694.613281 L 354.417969 695.28125 L 353.867188 695.832031 L 353.261719 696.261719 L 352.59375 696.617188 L 351.867188 696.851562 L 351.082031 697.007812 L 350.257812 697.046875 Z M 346.566406 695.4375 L 349.941406 695.4375 L 350.84375 695.378906 L 351.648438 695.164062 L 352.355469 694.789062 L 352.945312 694.300781 L 353.417969 693.632812 L 353.808594 692.828125 L 353.929688 692.414062 L 354.046875 691.984375 L 354.144531 691.511719 L 354.203125 691 L 354.242188 690.46875 L 354.261719 689.902344 L 354.183594 688.625 L 353.988281 687.503906 L 353.632812 686.542969 L 353.160156 685.777344 L 352.554688 685.148438 L 351.808594 684.699219 L 351.53125 684.597656 L 351.238281 684.5 L 350.921875 684.441406 L 350.609375 684.382812 L 350.277344 684.363281 L 349.941406 684.34375 L 346.566406 684.34375 Z M 346.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 399 L 337 399 M 318 380 L 337 380 M 318 380 L 318 399 M 337 380 L 337 399 " 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 318 399 L 337 399 M 318 380 L 337 380 M 337 399 L 337 380 M 318 399 L 318 380 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 354 387 L 354 392 M 351 390 L 356 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1445.964844 559.332031 L 1445.886719 560.589844 L 1445.691406 561.726562 L 1445.335938 562.789062 L 1444.867188 563.730469 L 1444.238281 564.632812 L 1443.492188 565.417969 L 1442.667969 566.085938 L 1441.804688 566.597656 L 1440.820312 566.988281 L 1439.800781 567.304688 L 1438.699219 567.460938 L 1437.523438 567.5 L 1424.601562 567.5 L 1424.601562 538.871094 L 1436.226562 538.871094 L 1437.914062 538.988281 L 1439.40625 539.265625 L 1440.742188 539.734375 L 1441.882812 540.402344 L 1442.863281 541.265625 L 1443.648438 542.328125 L 1443.960938 542.917969 L 1444.238281 543.542969 L 1444.433594 544.132812 L 1444.589844 544.800781 L 1444.667969 545.46875 L 1444.707031 546.136719 L 1444.589844 547.550781 L 1444.238281 548.769531 L 1443.6875 549.90625 L 1442.902344 550.847656 L 1441.921875 551.714844 L 1440.742188 552.378906 L 1441.882812 552.890625 L 1442.863281 553.441406 L 1443.726562 554.070312 L 1444.433594 554.777344 L 1444.984375 555.523438 L 1445.414062 556.308594 L 1445.574219 556.777344 L 1445.808594 557.722656 L 1445.886719 558.269531 L 1445.925781 558.78125 Z M 1441.058594 546.648438 L 1440.9375 545.46875 L 1440.585938 544.488281 L 1440.035156 543.625 L 1439.25 542.996094 L 1438.269531 542.523438 L 1437.050781 542.210938 L 1436.777344 542.210938 L 1436.5 542.171875 L 1436.226562 542.132812 L 1435.597656 542.132812 L 1435.324219 542.09375 L 1428.253906 542.09375 L 1428.253906 551.203125 L 1435.324219 551.203125 L 1436.777344 551.125 L 1438.03125 550.886719 L 1439.09375 550.457031 L 1439.878906 549.867188 L 1440.507812 549.082031 L 1440.898438 548.140625 L 1440.9375 547.941406 L 1441.015625 547.472656 L 1441.015625 546.921875 Z M 1437.167969 564.28125 L 1438.269531 564.242188 L 1439.25 564.003906 L 1440.113281 563.613281 L 1440.820312 563.101562 L 1441.410156 562.433594 L 1441.882812 561.609375 L 1442 561.296875 L 1442.078125 560.941406 L 1442.195312 560.550781 L 1442.234375 560.195312 L 1442.273438 559.804688 L 1442.3125 559.371094 L 1442.234375 558.507812 L 1442.078125 557.683594 L 1441.804688 556.976562 L 1441.410156 556.308594 L 1440.898438 555.757812 L 1440.3125 555.246094 L 1439.878906 555.011719 L 1439.40625 554.816406 L 1438.898438 554.660156 L 1438.347656 554.539062 L 1437.757812 554.460938 L 1437.167969 554.421875 L 1428.253906 554.421875 L 1428.253906 564.28125 Z M 1437.167969 564.28125 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1424 536 L 1443 536 M 1424 516 L 1443 516 M 1424 516 L 1424 536 M 1443 516 L 1443 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 1424 536 L 1443 536 M 1424 516 L 1443 516 M 1443 536 L 1443 516 M 1424 536 L 1424 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1488.699219 479.269531 L 1488.699219 490.5 L 1485.046875 490.5 L 1485.046875 479.269531 L 1474.011719 461.871094 L 1478.527344 461.871094 L 1486.929688 475.8125 L 1495.097656 461.871094 L 1499.457031 461.871094 Z M 1488.699219 479.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1476 613 L 1496 613 M 1476 594 L 1496 594 M 1476 594 L 1476 613 M 1496 594 L 1496 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1476 613 L 1496 613 M 1476 594 L 1496 594 M 1496 613 L 1496 594 M 1476 613 L 1476 594 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1334.113281 558.898438 L 1323.078125 558.898438 L 1320.054688 567.5 L 1316.167969 567.5 L 1326.378906 538.871094 L 1331.089844 538.871094 L 1341.144531 567.5 L 1337.058594 567.5 Z M 1333.09375 555.835938 L 1328.695312 542.796875 L 1323.984375 555.835938 Z M 1333.09375 555.835938 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1318 536 L 1338 536 M 1318 516 L 1338 516 M 1318 516 L 1318 536 M 1338 516 L 1338 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 1318 536 L 1338 536 M 1318 516 L 1338 516 M 1338 536 L 1338 516 M 1318 536 L 1318 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1317.195312 385.5 L 1315.234375 385.5 L 1310.089844 371.1875 L 1312.050781 371.1875 L 1316.253906 383.300781 L 1320.222656 371.1875 L 1322.164062 371.1875 Z M 1317.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1334.691406 375.386719 L 1334.652344 376.015625 L 1334.554688 376.585938 L 1334.378906 377.117188 L 1334.160156 377.585938 L 1333.847656 378.019531 L 1333.496094 378.410156 L 1333.101562 378.746094 L 1332.6875 379 L 1332.238281 379.195312 L 1331.746094 379.335938 L 1331.234375 379.414062 L 1330.6875 379.433594 L 1326.191406 379.433594 L 1326.191406 385.5 L 1324.363281 385.5 L 1324.363281 371.1875 L 1330.273438 371.1875 L 1331.117188 371.246094 L 1331.882812 371.382812 L 1332.550781 371.617188 L 1333.140625 371.953125 L 1333.632812 372.363281 L 1334.042969 372.875 L 1334.242188 373.246094 L 1334.398438 373.621094 L 1334.515625 374.011719 L 1334.613281 374.445312 L 1334.671875 374.917969 Z M 1326.191406 377.824219 L 1330 377.824219 L 1330.53125 377.804688 L 1331 377.703125 L 1331.433594 377.566406 L 1331.804688 377.351562 L 1332.121094 377.078125 L 1332.394531 376.742188 L 1332.492188 376.546875 L 1332.589844 376.3125 L 1332.667969 376.09375 L 1332.730469 375.839844 L 1332.769531 375.585938 L 1332.789062 375.308594 L 1332.75 374.839844 L 1332.648438 374.40625 L 1332.492188 374.03125 L 1332.277344 373.699219 L 1331.984375 373.425781 L 1331.648438 373.1875 L 1331.414062 373.089844 L 1331.15625 372.992188 L 1330.882812 372.914062 L 1330.609375 372.855469 L 1330.3125 372.816406 L 1330 372.796875 L 1326.191406 372.796875 Z M 1326.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1347.886719 381.414062 L 1347.847656 382.042969 L 1347.75 382.613281 L 1347.574219 383.144531 L 1347.335938 383.613281 L 1347.023438 384.066406 L 1346.648438 384.460938 L 1346.238281 384.792969 L 1345.804688 385.046875 L 1345.316406 385.246094 L 1344.804688 385.402344 L 1344.253906 385.480469 L 1343.664062 385.5 L 1337.207031 385.5 L 1337.207031 371.1875 L 1343.015625 371.1875 L 1343.863281 371.246094 L 1344.609375 371.382812 L 1345.277344 371.617188 L 1345.84375 371.953125 L 1346.335938 372.382812 L 1346.730469 372.914062 L 1346.886719 373.207031 L 1347.023438 373.523438 L 1347.121094 373.816406 L 1347.199219 374.152344 L 1347.238281 374.484375 L 1347.257812 374.820312 L 1347.199219 375.523438 L 1347.023438 376.132812 L 1346.75 376.703125 L 1346.355469 377.175781 L 1345.863281 377.605469 L 1345.277344 377.941406 L 1345.84375 378.195312 L 1346.335938 378.46875 L 1346.769531 378.785156 L 1347.121094 379.136719 L 1347.394531 379.511719 L 1347.613281 379.902344 L 1347.691406 380.140625 L 1347.808594 380.609375 L 1347.847656 380.886719 L 1347.867188 381.140625 Z M 1345.433594 375.074219 L 1345.375 374.484375 L 1345.195312 373.992188 L 1344.921875 373.5625 L 1344.53125 373.246094 L 1344.039062 373.011719 L 1343.429688 372.855469 L 1343.292969 372.855469 L 1343.15625 372.835938 L 1343.015625 372.816406 L 1342.703125 372.816406 L 1342.566406 372.796875 L 1339.03125 372.796875 L 1339.03125 377.351562 L 1342.566406 377.351562 L 1343.292969 377.3125 L 1343.921875 377.195312 L 1344.449219 376.976562 L 1344.84375 376.683594 L 1345.15625 376.292969 L 1345.355469 375.820312 L 1345.375 375.722656 L 1345.394531 375.605469 L 1345.414062 375.484375 L 1345.414062 375.210938 Z M 1343.488281 383.890625 L 1344.039062 383.871094 L 1344.53125 383.753906 L 1344.960938 383.554688 L 1345.316406 383.300781 L 1345.609375 382.96875 L 1345.84375 382.554688 L 1345.902344 382.398438 L 1345.941406 382.222656 L 1346.003906 382.023438 L 1346.023438 381.847656 L 1346.042969 381.652344 L 1346.0625 381.433594 L 1346.023438 381.003906 L 1345.941406 380.589844 L 1345.804688 380.238281 L 1345.609375 379.902344 L 1345.355469 379.628906 L 1345.058594 379.375 L 1344.84375 379.257812 L 1344.609375 379.15625 L 1344.351562 379.078125 L 1344.078125 379.019531 L 1343.785156 378.980469 L 1343.488281 378.960938 L 1339.03125 378.960938 L 1339.03125 383.890625 Z M 1343.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1318 711 L 1338 711 M 1318 691 L 1338 691 M 1318 691 L 1318 711 M 1338 691 L 1338 711 " 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 1318 711 L 1338 711 M 1318 691 L 1338 691 M 1338 711 L 1338 691 M 1318 711 L 1318 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1316.195312 696.5 L 1314.234375 696.5 L 1309.089844 682.1875 L 1311.050781 682.1875 L 1315.253906 694.300781 L 1319.222656 682.1875 L 1321.164062 682.1875 Z M 1316.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1334.261719 682.1875 L 1334.261719 696.5 L 1332.199219 696.5 L 1324.796875 684.894531 L 1324.796875 696.5 L 1323.070312 696.5 L 1323.070312 682.1875 L 1325.050781 682.1875 L 1332.535156 693.886719 L 1332.535156 682.1875 Z M 1334.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1347.96875 692.414062 L 1347.929688 693.042969 L 1347.828125 693.613281 L 1347.652344 694.144531 L 1347.417969 694.613281 L 1347.101562 695.066406 L 1346.730469 695.460938 L 1346.316406 695.792969 L 1345.886719 696.046875 L 1345.394531 696.246094 L 1344.882812 696.402344 L 1344.335938 696.480469 L 1343.746094 696.5 L 1337.285156 696.5 L 1337.285156 682.1875 L 1343.097656 682.1875 L 1343.941406 682.246094 L 1344.6875 682.382812 L 1345.355469 682.617188 L 1345.925781 682.953125 L 1346.414062 683.382812 L 1346.808594 683.914062 L 1346.964844 684.207031 L 1347.101562 684.523438 L 1347.203125 684.816406 L 1347.28125 685.152344 L 1347.320312 685.484375 L 1347.339844 685.820312 L 1347.28125 686.523438 L 1347.101562 687.132812 L 1346.828125 687.703125 L 1346.433594 688.175781 L 1345.945312 688.605469 L 1345.355469 688.941406 L 1345.925781 689.195312 L 1346.414062 689.46875 L 1346.847656 689.785156 L 1347.203125 690.136719 L 1347.476562 690.511719 L 1347.691406 690.902344 L 1347.769531 691.140625 L 1347.886719 691.609375 L 1347.929688 691.886719 L 1347.949219 692.140625 Z M 1345.511719 686.074219 L 1345.453125 685.484375 L 1345.277344 684.992188 L 1345.003906 684.5625 L 1344.609375 684.246094 L 1344.117188 684.011719 L 1343.511719 683.855469 L 1343.371094 683.855469 L 1343.097656 683.816406 L 1342.785156 683.816406 L 1342.644531 683.796875 L 1339.113281 683.796875 L 1339.113281 688.351562 L 1342.644531 688.351562 L 1343.371094 688.3125 L 1344 688.195312 L 1344.53125 687.976562 L 1344.921875 687.683594 L 1345.238281 687.292969 L 1345.433594 686.820312 L 1345.453125 686.722656 L 1345.472656 686.605469 L 1345.492188 686.484375 L 1345.492188 686.210938 Z M 1343.570312 694.890625 L 1344.117188 694.871094 L 1344.609375 694.753906 L 1345.042969 694.554688 L 1345.394531 694.300781 L 1345.6875 693.96875 L 1345.925781 693.554688 L 1345.984375 693.398438 L 1346.023438 693.222656 L 1346.082031 693.023438 L 1346.101562 692.847656 L 1346.121094 692.652344 L 1346.140625 692.433594 L 1346.101562 692.003906 L 1346.023438 691.589844 L 1345.886719 691.238281 L 1345.6875 690.902344 L 1345.433594 690.628906 L 1345.140625 690.375 L 1344.921875 690.257812 L 1344.6875 690.15625 L 1344.433594 690.078125 L 1344.15625 690.019531 L 1343.863281 689.980469 L 1343.570312 689.960938 L 1339.113281 689.960938 L 1339.113281 694.890625 Z M 1343.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1318 399 L 1338 399 M 1318 380 L 1338 380 M 1318 380 L 1318 399 M 1338 380 L 1338 399 " 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 1318 399 L 1338 399 M 1318 380 L 1338 380 M 1338 399 L 1338 380 M 1318 399 L 1318 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1309.195312 697.046875 L 1307.234375 697.046875 L 1302.089844 682.734375 L 1304.050781 682.734375 L 1308.253906 694.847656 L 1312.222656 682.734375 L 1314.164062 682.734375 Z M 1309.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1317.265625 689.941406 L 1317.285156 690.609375 L 1317.347656 691.234375 L 1317.464844 691.824219 L 1317.621094 692.414062 L 1317.835938 692.964844 L 1318.113281 693.476562 L 1318.582031 694.203125 L 1319.152344 694.789062 L 1319.800781 695.261719 L 1320.527344 695.59375 L 1321.351562 695.8125 L 1322.253906 695.890625 L 1322.390625 695.890625 L 1323 695.871094 L 1323.589844 695.773438 L 1324.121094 695.59375 L 1324.628906 695.378906 L 1325.101562 695.085938 L 1325.554688 694.710938 L 1325.925781 694.320312 L 1326.242188 693.886719 L 1326.496094 693.394531 L 1326.671875 692.886719 L 1326.789062 692.335938 L 1326.867188 691.746094 L 1326.867188 691.550781 L 1326.886719 691.492188 L 1326.886719 691.097656 L 1322.53125 691.097656 L 1322.53125 689.488281 L 1328.5 689.488281 L 1328.5 697.125 L 1327.339844 697.125 L 1326.886719 695.222656 L 1326.261719 695.851562 L 1325.59375 696.378906 L 1324.90625 696.8125 L 1324.179688 697.105469 L 1323.433594 697.324219 L 1322.667969 697.460938 L 1322.429688 697.460938 L 1322.332031 697.480469 L 1322.097656 697.480469 L 1322 697.5 L 1321.175781 697.441406 L 1320.390625 697.304688 L 1319.644531 697.085938 L 1318.957031 696.773438 L 1318.308594 696.359375 L 1317.699219 695.851562 L 1317.148438 695.300781 L 1316.679688 694.671875 L 1316.285156 694.003906 L 1315.972656 693.257812 L 1315.714844 692.453125 L 1315.558594 691.589844 L 1315.519531 691.355469 L 1315.480469 691.097656 L 1315.460938 690.84375 L 1315.441406 690.570312 L 1315.441406 690.039062 L 1315.460938 689.3125 L 1315.539062 688.605469 L 1315.65625 687.917969 L 1315.851562 687.25 L 1316.070312 686.601562 L 1316.363281 685.953125 L 1316.855469 685.128906 L 1317.425781 684.402344 L 1318.113281 683.792969 L 1318.859375 683.304688 L 1319.703125 682.929688 L 1320.644531 682.65625 L 1320.898438 682.617188 L 1321.175781 682.578125 L 1321.449219 682.558594 L 1321.722656 682.519531 L 1322.019531 682.519531 L 1322.3125 682.5 L 1323.257812 682.558594 L 1324.140625 682.695312 L 1324.945312 682.929688 L 1325.671875 683.265625 L 1326.320312 683.695312 L 1326.90625 684.207031 L 1327.242188 684.597656 L 1327.535156 685.03125 L 1327.792969 685.503906 L 1328.007812 685.992188 L 1328.164062 686.523438 L 1328.300781 687.074219 L 1326.4375 687.074219 L 1326.28125 686.5625 L 1326.082031 686.09375 L 1325.808594 685.660156 L 1325.496094 685.285156 L 1325.101562 684.953125 L 1324.667969 684.660156 L 1324.316406 684.5 L 1323.941406 684.363281 L 1323.550781 684.246094 L 1323.15625 684.1875 L 1322.726562 684.128906 L 1322.292969 684.109375 L 1321.566406 684.167969 L 1320.898438 684.285156 L 1320.292969 684.480469 L 1319.722656 684.777344 L 1319.191406 685.148438 L 1318.71875 685.601562 L 1318.289062 686.152344 L 1317.933594 686.757812 L 1317.660156 687.425781 L 1317.445312 688.152344 L 1317.304688 688.9375 L 1317.265625 689.785156 Z M 1317.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1342.519531 682.734375 L 1342.519531 697.046875 L 1340.457031 697.046875 L 1333.054688 685.445312 L 1333.054688 697.046875 L 1331.324219 697.046875 L 1331.324219 682.734375 L 1333.308594 682.734375 L 1340.789062 694.4375 L 1340.789062 682.734375 Z M 1342.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1345.738281 697.046875 L 1345.738281 682.734375 L 1351.257812 682.734375 L 1352.121094 682.792969 L 1352.925781 682.949219 L 1353.671875 683.226562 L 1354.359375 683.578125 L 1354.96875 684.070312 L 1355.535156 684.640625 L 1356.007812 685.324219 L 1356.402344 686.070312 L 1356.695312 686.917969 L 1356.910156 687.820312 L 1357.027344 688.820312 L 1357.085938 689.882812 L 1357.027344 691 L 1356.890625 692.042969 L 1356.65625 692.984375 L 1356.339844 693.847656 L 1355.929688 694.613281 L 1355.417969 695.28125 L 1354.867188 695.832031 L 1354.261719 696.261719 L 1353.59375 696.617188 L 1352.867188 696.851562 L 1352.082031 697.007812 L 1351.257812 697.046875 Z M 1347.566406 695.4375 L 1350.941406 695.4375 L 1351.84375 695.378906 L 1352.648438 695.164062 L 1353.355469 694.789062 L 1353.945312 694.300781 L 1354.417969 693.632812 L 1354.808594 692.828125 L 1354.929688 692.414062 L 1355.046875 691.984375 L 1355.144531 691.511719 L 1355.203125 691 L 1355.242188 690.46875 L 1355.261719 689.902344 L 1355.183594 688.625 L 1354.988281 687.503906 L 1354.632812 686.542969 L 1354.160156 685.777344 L 1353.554688 685.148438 L 1352.808594 684.699219 L 1352.53125 684.597656 L 1352.238281 684.5 L 1351.921875 684.441406 L 1351.609375 684.382812 L 1351.277344 684.363281 L 1350.941406 684.34375 L 1347.566406 684.34375 Z M 1347.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1318 399 L 1338 399 M 1318 380 L 1338 380 M 1318 380 L 1318 399 M 1338 380 L 1338 399 " 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 1318 399 L 1338 399 M 1318 380 L 1338 380 M 1338 399 L 1338 380 M 1318 399 L 1318 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1307.195312 385.5 L 1305.234375 385.5 L 1300.089844 371.1875 L 1302.050781 371.1875 L 1306.253906 383.300781 L 1310.222656 371.1875 L 1312.164062 371.1875 Z M 1307.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1324.691406 375.386719 L 1324.652344 376.015625 L 1324.554688 376.585938 L 1324.378906 377.117188 L 1324.160156 377.585938 L 1323.847656 378.019531 L 1323.496094 378.410156 L 1323.101562 378.746094 L 1322.6875 379 L 1322.238281 379.195312 L 1321.746094 379.335938 L 1321.234375 379.414062 L 1320.6875 379.433594 L 1316.191406 379.433594 L 1316.191406 385.5 L 1314.363281 385.5 L 1314.363281 371.1875 L 1320.273438 371.1875 L 1321.117188 371.246094 L 1321.882812 371.382812 L 1322.550781 371.617188 L 1323.140625 371.953125 L 1323.632812 372.363281 L 1324.042969 372.875 L 1324.242188 373.246094 L 1324.398438 373.621094 L 1324.515625 374.011719 L 1324.613281 374.445312 L 1324.671875 374.917969 Z M 1316.191406 377.824219 L 1320 377.824219 L 1320.53125 377.804688 L 1321 377.703125 L 1321.433594 377.566406 L 1321.804688 377.351562 L 1322.121094 377.078125 L 1322.394531 376.742188 L 1322.492188 376.546875 L 1322.589844 376.3125 L 1322.667969 376.09375 L 1322.730469 375.839844 L 1322.769531 375.585938 L 1322.789062 375.308594 L 1322.75 374.839844 L 1322.648438 374.40625 L 1322.492188 374.03125 L 1322.277344 373.699219 L 1321.984375 373.425781 L 1321.648438 373.1875 L 1321.414062 373.089844 L 1321.15625 372.992188 L 1320.882812 372.914062 L 1320.609375 372.855469 L 1320.3125 372.816406 L 1320 372.796875 L 1316.191406 372.796875 Z M 1316.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1340.261719 385.5 L 1338.261719 385.5 L 1334.960938 373.738281 L 1331.761719 385.5 L 1329.757812 385.5 L 1326.085938 371.1875 L 1328.128906 371.1875 L 1330.820312 382.808594 L 1334 371.1875 L 1335.960938 371.1875 L 1339.222656 382.808594 L 1341.851562 371.1875 L 1343.894531 371.1875 Z M 1340.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1354.695312 378.429688 L 1355.148438 378.6875 L 1355.558594 378.960938 L 1355.914062 379.277344 L 1356.1875 379.648438 L 1356.382812 380.042969 L 1356.539062 380.472656 L 1356.621094 380.964844 L 1356.640625 381.257812 L 1356.660156 381.59375 L 1356.660156 382.378906 L 1356.640625 382.789062 L 1356.660156 383.144531 L 1356.679688 383.457031 L 1356.71875 383.734375 L 1356.757812 383.96875 L 1356.835938 384.164062 L 1356.894531 384.359375 L 1356.992188 384.519531 L 1357.089844 384.675781 L 1357.207031 384.8125 L 1357.347656 384.949219 L 1357.503906 385.046875 L 1357.503906 385.5 L 1355.285156 385.5 L 1355.167969 385.1875 L 1355.066406 384.851562 L 1354.988281 384.460938 L 1354.929688 384.066406 L 1354.890625 383.632812 L 1354.890625 381.886719 L 1354.851562 381.316406 L 1354.753906 380.808594 L 1354.597656 380.375 L 1354.359375 380.023438 L 1354.066406 379.746094 L 1353.714844 379.53125 L 1353.535156 379.472656 L 1353.359375 379.433594 L 1353.164062 379.394531 L 1352.96875 379.375 L 1352.75 379.355469 L 1352.535156 379.335938 L 1347.824219 379.335938 L 1347.824219 385.5 L 1345.996094 385.5 L 1345.996094 371.1875 L 1352.59375 371.1875 L 1353.476562 371.246094 L 1354.28125 371.382812 L 1354.96875 371.636719 L 1355.558594 371.972656 L 1356.050781 372.402344 L 1356.441406 372.933594 L 1356.578125 373.246094 L 1356.71875 373.5625 L 1356.816406 373.894531 L 1356.894531 374.25 L 1356.933594 374.621094 L 1356.953125 375.015625 L 1356.914062 375.542969 L 1356.835938 376.035156 L 1356.699219 376.488281 L 1356.5 376.898438 L 1356.265625 377.273438 L 1355.972656 377.585938 L 1355.792969 377.742188 L 1355.597656 377.902344 L 1355.402344 378.039062 L 1355.1875 378.175781 L 1354.949219 378.3125 Z M 1355.046875 375.269531 L 1354.988281 374.679688 L 1354.871094 374.171875 L 1354.636719 373.738281 L 1354.339844 373.386719 L 1353.929688 373.128906 L 1353.457031 372.933594 L 1353.28125 372.894531 L 1353.085938 372.855469 L 1352.886719 372.835938 L 1352.671875 372.816406 L 1352.457031 372.816406 L 1352.242188 372.796875 L 1347.824219 372.796875 L 1347.824219 377.722656 L 1352.242188 377.722656 L 1352.886719 377.703125 L 1353.457031 377.585938 L 1353.929688 377.410156 L 1354.320312 377.15625 L 1354.636719 376.839844 L 1354.851562 376.449219 L 1354.910156 376.292969 L 1354.949219 376.09375 L 1354.988281 375.917969 L 1355.007812 375.703125 L 1355.027344 375.503906 Z M 1355.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1318 711 L 1338 711 M 1318 691 L 1338 691 M 1318 691 L 1318 711 M 1338 691 L 1338 711 " 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 1318 711 L 1338 711 M 1318 691 L 1338 691 M 1338 711 L 1338 691 M 1318 711 L 1318 691 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1476 536 L 1496 536 M 1476 516 L 1496 516 M 1476 516 L 1476 536 M 1496 516 L 1496 536 M 1371 536 L 1390 536 M 1371 516 L 1390 516 M 1371 516 L 1371 536 M 1390 516 L 1390 536 M 1301 387 L 1301 392 M 1298 390 L 1303 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 497.964844 559.332031 L 497.886719 560.589844 L 497.691406 561.726562 L 497.335938 562.789062 L 496.867188 563.730469 L 496.238281 564.632812 L 495.492188 565.417969 L 494.667969 566.085938 L 493.804688 566.597656 L 492.820312 566.988281 L 491.800781 567.304688 L 490.699219 567.460938 L 489.523438 567.5 L 476.601562 567.5 L 476.601562 538.871094 L 488.226562 538.871094 L 489.914062 538.988281 L 491.40625 539.265625 L 492.742188 539.734375 L 493.882812 540.402344 L 494.863281 541.265625 L 495.648438 542.328125 L 495.960938 542.917969 L 496.238281 543.542969 L 496.433594 544.132812 L 496.589844 544.800781 L 496.667969 545.46875 L 496.707031 546.136719 L 496.589844 547.550781 L 496.238281 548.769531 L 495.6875 549.90625 L 494.902344 550.847656 L 493.921875 551.714844 L 492.742188 552.378906 L 493.882812 552.890625 L 494.863281 553.441406 L 495.726562 554.070312 L 496.433594 554.777344 L 496.984375 555.523438 L 497.414062 556.308594 L 497.574219 556.777344 L 497.808594 557.722656 L 497.886719 558.269531 L 497.925781 558.78125 Z M 493.058594 546.648438 L 492.9375 545.46875 L 492.585938 544.488281 L 492.035156 543.625 L 491.25 542.996094 L 490.269531 542.523438 L 489.050781 542.210938 L 488.777344 542.210938 L 488.5 542.171875 L 488.226562 542.132812 L 487.597656 542.132812 L 487.324219 542.09375 L 480.253906 542.09375 L 480.253906 551.203125 L 487.324219 551.203125 L 488.777344 551.125 L 490.03125 550.886719 L 491.09375 550.457031 L 491.878906 549.867188 L 492.507812 549.082031 L 492.898438 548.140625 L 492.9375 547.941406 L 493.015625 547.472656 L 493.015625 546.921875 Z M 489.167969 564.28125 L 490.269531 564.242188 L 491.25 564.003906 L 492.113281 563.613281 L 492.820312 563.101562 L 493.410156 562.433594 L 493.882812 561.609375 L 494 561.296875 L 494.078125 560.941406 L 494.195312 560.550781 L 494.234375 560.195312 L 494.273438 559.804688 L 494.3125 559.371094 L 494.234375 558.507812 L 494.078125 557.683594 L 493.804688 556.976562 L 493.410156 556.308594 L 492.898438 555.757812 L 492.3125 555.246094 L 491.878906 555.011719 L 491.40625 554.816406 L 490.898438 554.660156 L 490.347656 554.539062 L 489.757812 554.460938 L 489.167969 554.421875 L 480.253906 554.421875 L 480.253906 564.28125 Z M 489.167969 564.28125 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 475 536 L 495 536 M 475 516 L 495 516 M 475 516 L 475 536 M 495 516 L 495 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 475 536 L 495 536 M 475 516 L 495 516 M 495 536 L 495 516 M 475 536 L 475 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 434.699219 479.269531 L 434.699219 490.5 L 431.046875 490.5 L 431.046875 479.269531 L 420.011719 461.871094 L 424.527344 461.871094 L 432.929688 475.8125 L 441.097656 461.871094 L 445.457031 461.871094 Z M 434.699219 479.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 423 613 L 442 613 M 423 594 L 442 594 M 423 594 L 423 613 M 442 594 L 442 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 423 613 L 442 613 M 423 594 L 442 594 M 442 613 L 442 594 M 423 613 L 423 594 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 596.113281 558.898438 L 585.078125 558.898438 L 582.054688 567.5 L 578.167969 567.5 L 588.378906 538.871094 L 593.089844 538.871094 L 603.144531 567.5 L 599.058594 567.5 Z M 595.09375 555.835938 L 590.695312 542.796875 L 585.984375 555.835938 Z M 595.09375 555.835938 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 536 L 600 536 M 580 516 L 600 516 M 580 516 L 580 536 M 600 516 L 600 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 580 536 L 600 536 M 580 516 L 600 516 M 600 536 L 600 516 M 580 536 L 580 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 579.195312 385.5 L 577.234375 385.5 L 572.089844 371.1875 L 574.050781 371.1875 L 578.253906 383.300781 L 582.222656 371.1875 L 584.164062 371.1875 Z M 579.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 596.691406 375.386719 L 596.652344 376.015625 L 596.554688 376.585938 L 596.378906 377.117188 L 596.160156 377.585938 L 595.847656 378.019531 L 595.496094 378.410156 L 595.101562 378.746094 L 594.6875 379 L 594.238281 379.195312 L 593.746094 379.335938 L 593.234375 379.414062 L 592.6875 379.433594 L 588.191406 379.433594 L 588.191406 385.5 L 586.363281 385.5 L 586.363281 371.1875 L 592.273438 371.1875 L 593.117188 371.246094 L 593.882812 371.382812 L 594.550781 371.617188 L 595.140625 371.953125 L 595.632812 372.363281 L 596.042969 372.875 L 596.242188 373.246094 L 596.398438 373.621094 L 596.515625 374.011719 L 596.613281 374.445312 L 596.671875 374.917969 Z M 588.191406 377.824219 L 592 377.824219 L 592.53125 377.804688 L 593 377.703125 L 593.433594 377.566406 L 593.804688 377.351562 L 594.121094 377.078125 L 594.394531 376.742188 L 594.492188 376.546875 L 594.589844 376.3125 L 594.667969 376.09375 L 594.730469 375.839844 L 594.769531 375.585938 L 594.789062 375.308594 L 594.75 374.839844 L 594.648438 374.40625 L 594.492188 374.03125 L 594.277344 373.699219 L 593.984375 373.425781 L 593.648438 373.1875 L 593.414062 373.089844 L 593.15625 372.992188 L 592.882812 372.914062 L 592.609375 372.855469 L 592.3125 372.816406 L 592 372.796875 L 588.191406 372.796875 Z M 588.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 609.886719 381.414062 L 609.847656 382.042969 L 609.75 382.613281 L 609.574219 383.144531 L 609.335938 383.613281 L 609.023438 384.066406 L 608.648438 384.460938 L 608.238281 384.792969 L 607.804688 385.046875 L 607.316406 385.246094 L 606.804688 385.402344 L 606.253906 385.480469 L 605.664062 385.5 L 599.207031 385.5 L 599.207031 371.1875 L 605.015625 371.1875 L 605.863281 371.246094 L 606.609375 371.382812 L 607.277344 371.617188 L 607.84375 371.953125 L 608.335938 372.382812 L 608.730469 372.914062 L 608.886719 373.207031 L 609.023438 373.523438 L 609.121094 373.816406 L 609.199219 374.152344 L 609.238281 374.484375 L 609.257812 374.820312 L 609.199219 375.523438 L 609.023438 376.132812 L 608.75 376.703125 L 608.355469 377.175781 L 607.863281 377.605469 L 607.277344 377.941406 L 607.84375 378.195312 L 608.335938 378.46875 L 608.769531 378.785156 L 609.121094 379.136719 L 609.394531 379.511719 L 609.613281 379.902344 L 609.691406 380.140625 L 609.808594 380.609375 L 609.847656 380.886719 L 609.867188 381.140625 Z M 607.433594 375.074219 L 607.375 374.484375 L 607.195312 373.992188 L 606.921875 373.5625 L 606.53125 373.246094 L 606.039062 373.011719 L 605.429688 372.855469 L 605.292969 372.855469 L 605.15625 372.835938 L 605.015625 372.816406 L 604.703125 372.816406 L 604.566406 372.796875 L 601.03125 372.796875 L 601.03125 377.351562 L 604.566406 377.351562 L 605.292969 377.3125 L 605.921875 377.195312 L 606.449219 376.976562 L 606.84375 376.683594 L 607.15625 376.292969 L 607.355469 375.820312 L 607.375 375.722656 L 607.394531 375.605469 L 607.414062 375.484375 L 607.414062 375.210938 Z M 605.488281 383.890625 L 606.039062 383.871094 L 606.53125 383.753906 L 606.960938 383.554688 L 607.316406 383.300781 L 607.609375 382.96875 L 607.84375 382.554688 L 607.902344 382.398438 L 607.941406 382.222656 L 608.003906 382.023438 L 608.023438 381.847656 L 608.042969 381.652344 L 608.0625 381.433594 L 608.023438 381.003906 L 607.941406 380.589844 L 607.804688 380.238281 L 607.609375 379.902344 L 607.355469 379.628906 L 607.058594 379.375 L 606.84375 379.257812 L 606.609375 379.15625 L 606.351562 379.078125 L 606.078125 379.019531 L 605.785156 378.980469 L 605.488281 378.960938 L 601.03125 378.960938 L 601.03125 383.890625 Z M 605.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 711 L 600 711 M 580 691 L 600 691 M 580 691 L 580 711 M 600 691 L 600 711 " 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 711 L 600 711 M 580 691 L 600 691 M 600 711 L 600 691 M 580 711 L 580 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 578.195312 696.5 L 576.234375 696.5 L 571.089844 682.1875 L 573.050781 682.1875 L 577.253906 694.300781 L 581.222656 682.1875 L 583.164062 682.1875 Z M 578.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 596.261719 682.1875 L 596.261719 696.5 L 594.199219 696.5 L 586.796875 684.894531 L 586.796875 696.5 L 585.070312 696.5 L 585.070312 682.1875 L 587.050781 682.1875 L 594.535156 693.886719 L 594.535156 682.1875 Z M 596.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 609.96875 692.414062 L 609.929688 693.042969 L 609.828125 693.613281 L 609.652344 694.144531 L 609.417969 694.613281 L 609.101562 695.066406 L 608.730469 695.460938 L 608.316406 695.792969 L 607.886719 696.046875 L 607.394531 696.246094 L 606.882812 696.402344 L 606.335938 696.480469 L 605.746094 696.5 L 599.285156 696.5 L 599.285156 682.1875 L 605.097656 682.1875 L 605.941406 682.246094 L 606.6875 682.382812 L 607.355469 682.617188 L 607.925781 682.953125 L 608.414062 683.382812 L 608.808594 683.914062 L 608.964844 684.207031 L 609.101562 684.523438 L 609.203125 684.816406 L 609.28125 685.152344 L 609.320312 685.484375 L 609.339844 685.820312 L 609.28125 686.523438 L 609.101562 687.132812 L 608.828125 687.703125 L 608.433594 688.175781 L 607.945312 688.605469 L 607.355469 688.941406 L 607.925781 689.195312 L 608.414062 689.46875 L 608.847656 689.785156 L 609.203125 690.136719 L 609.476562 690.511719 L 609.691406 690.902344 L 609.769531 691.140625 L 609.886719 691.609375 L 609.929688 691.886719 L 609.949219 692.140625 Z M 607.511719 686.074219 L 607.453125 685.484375 L 607.277344 684.992188 L 607.003906 684.5625 L 606.609375 684.246094 L 606.117188 684.011719 L 605.511719 683.855469 L 605.371094 683.855469 L 605.097656 683.816406 L 604.785156 683.816406 L 604.644531 683.796875 L 601.113281 683.796875 L 601.113281 688.351562 L 604.644531 688.351562 L 605.371094 688.3125 L 606 688.195312 L 606.53125 687.976562 L 606.921875 687.683594 L 607.238281 687.292969 L 607.433594 686.820312 L 607.453125 686.722656 L 607.472656 686.605469 L 607.492188 686.484375 L 607.492188 686.210938 Z M 605.570312 694.890625 L 606.117188 694.871094 L 606.609375 694.753906 L 607.042969 694.554688 L 607.394531 694.300781 L 607.6875 693.96875 L 607.925781 693.554688 L 607.984375 693.398438 L 608.023438 693.222656 L 608.082031 693.023438 L 608.101562 692.847656 L 608.121094 692.652344 L 608.140625 692.433594 L 608.101562 692.003906 L 608.023438 691.589844 L 607.886719 691.238281 L 607.6875 690.902344 L 607.433594 690.628906 L 607.140625 690.375 L 606.921875 690.257812 L 606.6875 690.15625 L 606.433594 690.078125 L 606.15625 690.019531 L 605.863281 689.980469 L 605.570312 689.960938 L 601.113281 689.960938 L 601.113281 694.890625 Z M 605.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 399 L 600 399 M 580 380 L 600 380 M 580 380 L 580 399 M 600 380 L 600 399 " 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 399 L 600 399 M 580 380 L 600 380 M 600 399 L 600 380 M 580 399 L 580 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 571.195312 697.046875 L 569.234375 697.046875 L 564.089844 682.734375 L 566.050781 682.734375 L 570.253906 694.847656 L 574.222656 682.734375 L 576.164062 682.734375 Z M 571.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 579.265625 689.941406 L 579.285156 690.609375 L 579.347656 691.234375 L 579.464844 691.824219 L 579.621094 692.414062 L 579.835938 692.964844 L 580.113281 693.476562 L 580.582031 694.203125 L 581.152344 694.789062 L 581.800781 695.261719 L 582.527344 695.59375 L 583.351562 695.8125 L 584.253906 695.890625 L 584.390625 695.890625 L 585 695.871094 L 585.589844 695.773438 L 586.121094 695.59375 L 586.628906 695.378906 L 587.101562 695.085938 L 587.554688 694.710938 L 587.925781 694.320312 L 588.242188 693.886719 L 588.496094 693.394531 L 588.671875 692.886719 L 588.789062 692.335938 L 588.867188 691.746094 L 588.867188 691.550781 L 588.886719 691.492188 L 588.886719 691.097656 L 584.53125 691.097656 L 584.53125 689.488281 L 590.5 689.488281 L 590.5 697.125 L 589.339844 697.125 L 588.886719 695.222656 L 588.261719 695.851562 L 587.59375 696.378906 L 586.90625 696.8125 L 586.179688 697.105469 L 585.433594 697.324219 L 584.667969 697.460938 L 584.429688 697.460938 L 584.332031 697.480469 L 584.097656 697.480469 L 584 697.5 L 583.175781 697.441406 L 582.390625 697.304688 L 581.644531 697.085938 L 580.957031 696.773438 L 580.308594 696.359375 L 579.699219 695.851562 L 579.148438 695.300781 L 578.679688 694.671875 L 578.285156 694.003906 L 577.972656 693.257812 L 577.714844 692.453125 L 577.558594 691.589844 L 577.519531 691.355469 L 577.480469 691.097656 L 577.460938 690.84375 L 577.441406 690.570312 L 577.441406 690.039062 L 577.460938 689.3125 L 577.539062 688.605469 L 577.65625 687.917969 L 577.851562 687.25 L 578.070312 686.601562 L 578.363281 685.953125 L 578.855469 685.128906 L 579.425781 684.402344 L 580.113281 683.792969 L 580.859375 683.304688 L 581.703125 682.929688 L 582.644531 682.65625 L 582.898438 682.617188 L 583.175781 682.578125 L 583.449219 682.558594 L 583.722656 682.519531 L 584.019531 682.519531 L 584.3125 682.5 L 585.257812 682.558594 L 586.140625 682.695312 L 586.945312 682.929688 L 587.671875 683.265625 L 588.320312 683.695312 L 588.90625 684.207031 L 589.242188 684.597656 L 589.535156 685.03125 L 589.792969 685.503906 L 590.007812 685.992188 L 590.164062 686.523438 L 590.300781 687.074219 L 588.4375 687.074219 L 588.28125 686.5625 L 588.082031 686.09375 L 587.808594 685.660156 L 587.496094 685.285156 L 587.101562 684.953125 L 586.667969 684.660156 L 586.316406 684.5 L 585.941406 684.363281 L 585.550781 684.246094 L 585.15625 684.1875 L 584.726562 684.128906 L 584.292969 684.109375 L 583.566406 684.167969 L 582.898438 684.285156 L 582.292969 684.480469 L 581.722656 684.777344 L 581.191406 685.148438 L 580.71875 685.601562 L 580.289062 686.152344 L 579.933594 686.757812 L 579.660156 687.425781 L 579.445312 688.152344 L 579.304688 688.9375 L 579.265625 689.785156 Z M 579.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 604.519531 682.734375 L 604.519531 697.046875 L 602.457031 697.046875 L 595.054688 685.445312 L 595.054688 697.046875 L 593.324219 697.046875 L 593.324219 682.734375 L 595.308594 682.734375 L 602.789062 694.4375 L 602.789062 682.734375 Z M 604.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 607.738281 697.046875 L 607.738281 682.734375 L 613.257812 682.734375 L 614.121094 682.792969 L 614.925781 682.949219 L 615.671875 683.226562 L 616.359375 683.578125 L 616.96875 684.070312 L 617.535156 684.640625 L 618.007812 685.324219 L 618.402344 686.070312 L 618.695312 686.917969 L 618.910156 687.820312 L 619.027344 688.820312 L 619.085938 689.882812 L 619.027344 691 L 618.890625 692.042969 L 618.65625 692.984375 L 618.339844 693.847656 L 617.929688 694.613281 L 617.417969 695.28125 L 616.867188 695.832031 L 616.261719 696.261719 L 615.59375 696.617188 L 614.867188 696.851562 L 614.082031 697.007812 L 613.257812 697.046875 Z M 609.566406 695.4375 L 612.941406 695.4375 L 613.84375 695.378906 L 614.648438 695.164062 L 615.355469 694.789062 L 615.945312 694.300781 L 616.417969 693.632812 L 616.808594 692.828125 L 616.929688 692.414062 L 617.046875 691.984375 L 617.144531 691.511719 L 617.203125 691 L 617.242188 690.46875 L 617.261719 689.902344 L 617.183594 688.625 L 616.988281 687.503906 L 616.632812 686.542969 L 616.160156 685.777344 L 615.554688 685.148438 L 614.808594 684.699219 L 614.53125 684.597656 L 614.238281 684.5 L 613.921875 684.441406 L 613.609375 684.382812 L 613.277344 684.363281 L 612.941406 684.34375 L 609.566406 684.34375 Z M 609.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 399 L 600 399 M 580 380 L 600 380 M 580 380 L 580 399 M 600 380 L 600 399 " 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 399 L 600 399 M 580 380 L 600 380 M 600 399 L 600 380 M 580 399 L 580 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 569.195312 385.5 L 567.234375 385.5 L 562.089844 371.1875 L 564.050781 371.1875 L 568.253906 383.300781 L 572.222656 371.1875 L 574.164062 371.1875 Z M 569.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 586.691406 375.386719 L 586.652344 376.015625 L 586.554688 376.585938 L 586.378906 377.117188 L 586.160156 377.585938 L 585.847656 378.019531 L 585.496094 378.410156 L 585.101562 378.746094 L 584.6875 379 L 584.238281 379.195312 L 583.746094 379.335938 L 583.234375 379.414062 L 582.6875 379.433594 L 578.191406 379.433594 L 578.191406 385.5 L 576.363281 385.5 L 576.363281 371.1875 L 582.273438 371.1875 L 583.117188 371.246094 L 583.882812 371.382812 L 584.550781 371.617188 L 585.140625 371.953125 L 585.632812 372.363281 L 586.042969 372.875 L 586.242188 373.246094 L 586.398438 373.621094 L 586.515625 374.011719 L 586.613281 374.445312 L 586.671875 374.917969 Z M 578.191406 377.824219 L 582 377.824219 L 582.53125 377.804688 L 583 377.703125 L 583.433594 377.566406 L 583.804688 377.351562 L 584.121094 377.078125 L 584.394531 376.742188 L 584.492188 376.546875 L 584.589844 376.3125 L 584.667969 376.09375 L 584.730469 375.839844 L 584.769531 375.585938 L 584.789062 375.308594 L 584.75 374.839844 L 584.648438 374.40625 L 584.492188 374.03125 L 584.277344 373.699219 L 583.984375 373.425781 L 583.648438 373.1875 L 583.414062 373.089844 L 583.15625 372.992188 L 582.882812 372.914062 L 582.609375 372.855469 L 582.3125 372.816406 L 582 372.796875 L 578.191406 372.796875 Z M 578.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 602.261719 385.5 L 600.261719 385.5 L 596.960938 373.738281 L 593.761719 385.5 L 591.757812 385.5 L 588.085938 371.1875 L 590.128906 371.1875 L 592.820312 382.808594 L 596 371.1875 L 597.960938 371.1875 L 601.222656 382.808594 L 603.851562 371.1875 L 605.894531 371.1875 Z M 602.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 616.695312 378.429688 L 617.148438 378.6875 L 617.558594 378.960938 L 617.914062 379.277344 L 618.1875 379.648438 L 618.382812 380.042969 L 618.539062 380.472656 L 618.621094 380.964844 L 618.640625 381.257812 L 618.660156 381.59375 L 618.660156 382.378906 L 618.640625 382.789062 L 618.660156 383.144531 L 618.679688 383.457031 L 618.71875 383.734375 L 618.757812 383.96875 L 618.835938 384.164062 L 618.894531 384.359375 L 618.992188 384.519531 L 619.089844 384.675781 L 619.207031 384.8125 L 619.347656 384.949219 L 619.503906 385.046875 L 619.503906 385.5 L 617.285156 385.5 L 617.167969 385.1875 L 617.066406 384.851562 L 616.988281 384.460938 L 616.929688 384.066406 L 616.890625 383.632812 L 616.890625 381.886719 L 616.851562 381.316406 L 616.753906 380.808594 L 616.597656 380.375 L 616.359375 380.023438 L 616.066406 379.746094 L 615.714844 379.53125 L 615.535156 379.472656 L 615.359375 379.433594 L 615.164062 379.394531 L 614.96875 379.375 L 614.75 379.355469 L 614.535156 379.335938 L 609.824219 379.335938 L 609.824219 385.5 L 607.996094 385.5 L 607.996094 371.1875 L 614.59375 371.1875 L 615.476562 371.246094 L 616.28125 371.382812 L 616.96875 371.636719 L 617.558594 371.972656 L 618.050781 372.402344 L 618.441406 372.933594 L 618.578125 373.246094 L 618.71875 373.5625 L 618.816406 373.894531 L 618.894531 374.25 L 618.933594 374.621094 L 618.953125 375.015625 L 618.914062 375.542969 L 618.835938 376.035156 L 618.699219 376.488281 L 618.5 376.898438 L 618.265625 377.273438 L 617.972656 377.585938 L 617.792969 377.742188 L 617.597656 377.902344 L 617.402344 378.039062 L 617.1875 378.175781 L 616.949219 378.3125 Z M 617.046875 375.269531 L 616.988281 374.679688 L 616.871094 374.171875 L 616.636719 373.738281 L 616.339844 373.386719 L 615.929688 373.128906 L 615.457031 372.933594 L 615.28125 372.894531 L 615.085938 372.855469 L 614.886719 372.835938 L 614.671875 372.816406 L 614.457031 372.816406 L 614.242188 372.796875 L 609.824219 372.796875 L 609.824219 377.722656 L 614.242188 377.722656 L 614.886719 377.703125 L 615.457031 377.585938 L 615.929688 377.410156 L 616.320312 377.15625 L 616.636719 376.839844 L 616.851562 376.449219 L 616.910156 376.292969 L 616.949219 376.09375 L 616.988281 375.917969 L 617.007812 375.703125 L 617.027344 375.503906 Z M 617.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 580 711 L 600 711 M 580 691 L 600 691 M 580 691 L 580 711 M 600 691 L 600 711 " 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 711 L 600 711 M 580 691 L 600 691 M 600 711 L 600 691 M 580 711 L 580 691 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 423 536 L 442 536 M 423 516 L 442 516 M 423 516 L 423 536 M 442 516 L 442 536 M 528 536 L 547 536 M 528 516 L 547 516 M 528 516 L 528 536 M 547 516 L 547 536 M 617 387 L 617 392 M 614 390 L 619 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1276.726562 594.679688 L 1276.726562 601.5 L 1274.511719 601.5 L 1274.511719 594.679688 L 1267.808594 584.117188 L 1270.550781 584.117188 L 1275.652344 592.582031 L 1280.613281 584.117188 L 1283.261719 584.117188 Z M 1276.726562 594.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1266 497 L 1285 497 M 1266 477 L 1285 477 M 1266 477 L 1266 497 M 1285 477 L 1285 497 " 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 497 L 1285 497 M 1266 477 L 1285 477 M 1285 497 L 1285 477 M 1266 497 L 1266 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1276.726562 555.679688 L 1276.726562 562.5 L 1274.511719 562.5 L 1274.511719 555.679688 L 1267.808594 545.117188 L 1270.550781 545.117188 L 1275.652344 553.582031 L 1280.613281 545.117188 L 1283.261719 545.117188 Z M 1276.726562 555.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1266 536 L 1285 536 M 1266 516 L 1285 516 M 1266 516 L 1266 536 M 1285 516 L 1285 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 1266 536 L 1285 536 M 1266 516 L 1285 516 M 1285 536 L 1285 516 M 1266 536 L 1266 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1276.726562 516.679688 L 1276.726562 523.5 L 1274.511719 523.5 L 1274.511719 516.679688 L 1267.808594 506.117188 L 1270.550781 506.117188 L 1275.652344 514.582031 L 1280.613281 506.117188 L 1283.261719 506.117188 Z M 1276.726562 516.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1266 574 L 1285 574 M 1266 555 L 1285 555 M 1266 555 L 1266 574 M 1285 555 L 1285 574 " 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 574 L 1285 574 M 1266 555 L 1285 555 M 1285 574 L 1285 555 M 1266 574 L 1266 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1226.800781 557.277344 L 1220.101562 557.277344 L 1218.265625 562.5 L 1215.90625 562.5 L 1222.105469 545.117188 L 1224.964844 545.117188 L 1231.070312 562.5 L 1228.589844 562.5 Z M 1226.179688 555.417969 L 1223.511719 547.503906 L 1220.648438 555.417969 Z M 1226.179688 555.417969 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1213 536 L 1232 536 M 1213 516 L 1232 516 M 1213 516 L 1213 536 M 1232 516 L 1232 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 1213 536 L 1232 536 M 1213 516 L 1232 516 M 1232 536 L 1232 516 M 1213 536 L 1213 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1125.355469 557.539062 L 1125.304688 558.304688 L 1125.1875 558.996094 L 1124.972656 559.640625 L 1124.6875 560.210938 L 1124.304688 560.757812 L 1123.851562 561.234375 L 1123.351562 561.640625 L 1122.828125 561.953125 L 1122.230469 562.191406 L 1121.609375 562.378906 L 1120.941406 562.476562 L 1120.226562 562.5 L 1112.382812 562.5 L 1112.382812 545.117188 L 1119.441406 545.117188 L 1120.464844 545.191406 L 1121.371094 545.355469 L 1122.183594 545.644531 L 1122.875 546.046875 L 1123.46875 546.574219 L 1123.949219 547.214844 L 1124.136719 547.574219 L 1124.304688 547.957031 L 1124.425781 548.3125 L 1124.519531 548.71875 L 1124.566406 549.125 L 1124.589844 549.53125 L 1124.519531 550.386719 L 1124.304688 551.125 L 1123.972656 551.820312 L 1123.496094 552.390625 L 1122.898438 552.914062 L 1122.183594 553.320312 L 1122.875 553.628906 L 1123.46875 553.964844 L 1123.996094 554.347656 L 1124.425781 554.773438 L 1124.757812 555.226562 L 1125.019531 555.703125 L 1125.117188 555.992188 L 1125.257812 556.5625 L 1125.304688 556.898438 L 1125.332031 557.207031 Z M 1122.375 549.839844 L 1122.300781 549.125 L 1122.085938 548.527344 L 1121.753906 548.003906 L 1121.277344 547.621094 L 1120.679688 547.335938 L 1119.941406 547.144531 L 1119.773438 547.144531 L 1119.609375 547.121094 L 1119.441406 547.097656 L 1119.058594 547.097656 L 1118.894531 547.074219 L 1114.601562 547.074219 L 1114.601562 552.605469 L 1118.894531 552.605469 L 1119.773438 552.558594 L 1120.539062 552.414062 L 1121.179688 552.152344 L 1121.660156 551.792969 L 1122.039062 551.316406 L 1122.277344 550.746094 L 1122.300781 550.625 L 1122.324219 550.484375 L 1122.351562 550.339844 L 1122.351562 550.007812 Z M 1120.011719 560.542969 L 1120.679688 560.519531 L 1121.277344 560.378906 L 1121.800781 560.140625 L 1122.230469 559.828125 L 1122.589844 559.425781 L 1122.875 558.921875 L 1122.945312 558.734375 L 1122.992188 558.519531 L 1123.066406 558.28125 L 1123.089844 558.066406 L 1123.113281 557.828125 L 1123.136719 557.566406 L 1123.089844 557.039062 L 1122.992188 556.539062 L 1122.828125 556.109375 L 1122.589844 555.703125 L 1122.277344 555.371094 L 1121.921875 555.0625 L 1121.660156 554.917969 L 1121.371094 554.796875 L 1121.0625 554.703125 L 1120.730469 554.632812 L 1120.371094 554.585938 L 1120.011719 554.558594 L 1114.601562 554.558594 L 1114.601562 560.542969 Z M 1120.011719 560.542969 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1108 536 L 1127 536 M 1108 516 L 1127 516 M 1108 516 L 1108 536 M 1127 516 L 1127 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 1108 536 L 1127 536 M 1108 516 L 1127 516 M 1127 536 L 1127 516 M 1108 536 L 1108 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1054.195312 385.5 L 1052.234375 385.5 L 1047.089844 371.1875 L 1049.050781 371.1875 L 1053.253906 383.300781 L 1057.222656 371.1875 L 1059.164062 371.1875 Z M 1054.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1071.691406 375.386719 L 1071.652344 376.015625 L 1071.554688 376.585938 L 1071.378906 377.117188 L 1071.160156 377.585938 L 1070.847656 378.019531 L 1070.496094 378.410156 L 1070.101562 378.746094 L 1069.6875 379 L 1069.238281 379.195312 L 1068.746094 379.335938 L 1068.234375 379.414062 L 1067.6875 379.433594 L 1063.191406 379.433594 L 1063.191406 385.5 L 1061.363281 385.5 L 1061.363281 371.1875 L 1067.273438 371.1875 L 1068.117188 371.246094 L 1068.882812 371.382812 L 1069.550781 371.617188 L 1070.140625 371.953125 L 1070.632812 372.363281 L 1071.042969 372.875 L 1071.242188 373.246094 L 1071.398438 373.621094 L 1071.515625 374.011719 L 1071.613281 374.445312 L 1071.671875 374.917969 Z M 1063.191406 377.824219 L 1067 377.824219 L 1067.53125 377.804688 L 1068 377.703125 L 1068.433594 377.566406 L 1068.804688 377.351562 L 1069.121094 377.078125 L 1069.394531 376.742188 L 1069.492188 376.546875 L 1069.589844 376.3125 L 1069.667969 376.09375 L 1069.730469 375.839844 L 1069.769531 375.585938 L 1069.789062 375.308594 L 1069.75 374.839844 L 1069.648438 374.40625 L 1069.492188 374.03125 L 1069.277344 373.699219 L 1068.984375 373.425781 L 1068.648438 373.1875 L 1068.414062 373.089844 L 1068.15625 372.992188 L 1067.882812 372.914062 L 1067.609375 372.855469 L 1067.3125 372.816406 L 1067 372.796875 L 1063.191406 372.796875 Z M 1063.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1084.886719 381.414062 L 1084.847656 382.042969 L 1084.75 382.613281 L 1084.574219 383.144531 L 1084.335938 383.613281 L 1084.023438 384.066406 L 1083.648438 384.460938 L 1083.238281 384.792969 L 1082.804688 385.046875 L 1082.316406 385.246094 L 1081.804688 385.402344 L 1081.253906 385.480469 L 1080.664062 385.5 L 1074.207031 385.5 L 1074.207031 371.1875 L 1080.015625 371.1875 L 1080.863281 371.246094 L 1081.609375 371.382812 L 1082.277344 371.617188 L 1082.84375 371.953125 L 1083.335938 372.382812 L 1083.730469 372.914062 L 1083.886719 373.207031 L 1084.023438 373.523438 L 1084.121094 373.816406 L 1084.199219 374.152344 L 1084.238281 374.484375 L 1084.257812 374.820312 L 1084.199219 375.523438 L 1084.023438 376.132812 L 1083.75 376.703125 L 1083.355469 377.175781 L 1082.863281 377.605469 L 1082.277344 377.941406 L 1082.84375 378.195312 L 1083.335938 378.46875 L 1083.769531 378.785156 L 1084.121094 379.136719 L 1084.394531 379.511719 L 1084.613281 379.902344 L 1084.691406 380.140625 L 1084.808594 380.609375 L 1084.847656 380.886719 L 1084.867188 381.140625 Z M 1082.433594 375.074219 L 1082.375 374.484375 L 1082.195312 373.992188 L 1081.921875 373.5625 L 1081.53125 373.246094 L 1081.039062 373.011719 L 1080.429688 372.855469 L 1080.292969 372.855469 L 1080.15625 372.835938 L 1080.015625 372.816406 L 1079.703125 372.816406 L 1079.566406 372.796875 L 1076.03125 372.796875 L 1076.03125 377.351562 L 1079.566406 377.351562 L 1080.292969 377.3125 L 1080.921875 377.195312 L 1081.449219 376.976562 L 1081.84375 376.683594 L 1082.15625 376.292969 L 1082.355469 375.820312 L 1082.375 375.722656 L 1082.394531 375.605469 L 1082.414062 375.484375 L 1082.414062 375.210938 Z M 1080.488281 383.890625 L 1081.039062 383.871094 L 1081.53125 383.753906 L 1081.960938 383.554688 L 1082.316406 383.300781 L 1082.609375 382.96875 L 1082.84375 382.554688 L 1082.902344 382.398438 L 1082.941406 382.222656 L 1083.003906 382.023438 L 1083.023438 381.847656 L 1083.042969 381.652344 L 1083.0625 381.433594 L 1083.023438 381.003906 L 1082.941406 380.589844 L 1082.804688 380.238281 L 1082.609375 379.902344 L 1082.355469 379.628906 L 1082.058594 379.375 L 1081.84375 379.257812 L 1081.609375 379.15625 L 1081.351562 379.078125 L 1081.078125 379.019531 L 1080.785156 378.980469 L 1080.488281 378.960938 L 1076.03125 378.960938 L 1076.03125 383.890625 Z M 1080.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 711 L 1075 711 M 1055 691 L 1075 691 M 1055 691 L 1055 711 M 1075 691 L 1075 711 " 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 1055 711 L 1075 711 M 1055 691 L 1075 691 M 1075 711 L 1075 691 M 1055 711 L 1055 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1053.195312 696.5 L 1051.234375 696.5 L 1046.089844 682.1875 L 1048.050781 682.1875 L 1052.253906 694.300781 L 1056.222656 682.1875 L 1058.164062 682.1875 Z M 1053.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1071.261719 682.1875 L 1071.261719 696.5 L 1069.199219 696.5 L 1061.796875 684.894531 L 1061.796875 696.5 L 1060.070312 696.5 L 1060.070312 682.1875 L 1062.050781 682.1875 L 1069.535156 693.886719 L 1069.535156 682.1875 Z M 1071.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1084.96875 692.414062 L 1084.929688 693.042969 L 1084.828125 693.613281 L 1084.652344 694.144531 L 1084.417969 694.613281 L 1084.101562 695.066406 L 1083.730469 695.460938 L 1083.316406 695.792969 L 1082.886719 696.046875 L 1082.394531 696.246094 L 1081.882812 696.402344 L 1081.335938 696.480469 L 1080.746094 696.5 L 1074.285156 696.5 L 1074.285156 682.1875 L 1080.097656 682.1875 L 1080.941406 682.246094 L 1081.6875 682.382812 L 1082.355469 682.617188 L 1082.925781 682.953125 L 1083.414062 683.382812 L 1083.808594 683.914062 L 1083.964844 684.207031 L 1084.101562 684.523438 L 1084.203125 684.816406 L 1084.28125 685.152344 L 1084.320312 685.484375 L 1084.339844 685.820312 L 1084.28125 686.523438 L 1084.101562 687.132812 L 1083.828125 687.703125 L 1083.433594 688.175781 L 1082.945312 688.605469 L 1082.355469 688.941406 L 1082.925781 689.195312 L 1083.414062 689.46875 L 1083.847656 689.785156 L 1084.203125 690.136719 L 1084.476562 690.511719 L 1084.691406 690.902344 L 1084.769531 691.140625 L 1084.886719 691.609375 L 1084.929688 691.886719 L 1084.949219 692.140625 Z M 1082.511719 686.074219 L 1082.453125 685.484375 L 1082.277344 684.992188 L 1082.003906 684.5625 L 1081.609375 684.246094 L 1081.117188 684.011719 L 1080.511719 683.855469 L 1080.371094 683.855469 L 1080.097656 683.816406 L 1079.785156 683.816406 L 1079.644531 683.796875 L 1076.113281 683.796875 L 1076.113281 688.351562 L 1079.644531 688.351562 L 1080.371094 688.3125 L 1081 688.195312 L 1081.53125 687.976562 L 1081.921875 687.683594 L 1082.238281 687.292969 L 1082.433594 686.820312 L 1082.453125 686.722656 L 1082.472656 686.605469 L 1082.492188 686.484375 L 1082.492188 686.210938 Z M 1080.570312 694.890625 L 1081.117188 694.871094 L 1081.609375 694.753906 L 1082.042969 694.554688 L 1082.394531 694.300781 L 1082.6875 693.96875 L 1082.925781 693.554688 L 1082.984375 693.398438 L 1083.023438 693.222656 L 1083.082031 693.023438 L 1083.101562 692.847656 L 1083.121094 692.652344 L 1083.140625 692.433594 L 1083.101562 692.003906 L 1083.023438 691.589844 L 1082.886719 691.238281 L 1082.6875 690.902344 L 1082.433594 690.628906 L 1082.140625 690.375 L 1081.921875 690.257812 L 1081.6875 690.15625 L 1081.433594 690.078125 L 1081.15625 690.019531 L 1080.863281 689.980469 L 1080.570312 689.960938 L 1076.113281 689.960938 L 1076.113281 694.890625 Z M 1080.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 399 L 1075 399 M 1055 380 L 1075 380 M 1055 380 L 1055 399 M 1075 380 L 1075 399 " 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 1055 399 L 1075 399 M 1055 380 L 1075 380 M 1075 399 L 1075 380 M 1055 399 L 1055 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1046.195312 697.046875 L 1044.234375 697.046875 L 1039.089844 682.734375 L 1041.050781 682.734375 L 1045.253906 694.847656 L 1049.222656 682.734375 L 1051.164062 682.734375 Z M 1046.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1054.265625 689.941406 L 1054.285156 690.609375 L 1054.347656 691.234375 L 1054.464844 691.824219 L 1054.621094 692.414062 L 1054.835938 692.964844 L 1055.113281 693.476562 L 1055.582031 694.203125 L 1056.152344 694.789062 L 1056.800781 695.261719 L 1057.527344 695.59375 L 1058.351562 695.8125 L 1059.253906 695.890625 L 1059.390625 695.890625 L 1060 695.871094 L 1060.589844 695.773438 L 1061.121094 695.59375 L 1061.628906 695.378906 L 1062.101562 695.085938 L 1062.554688 694.710938 L 1062.925781 694.320312 L 1063.242188 693.886719 L 1063.496094 693.394531 L 1063.671875 692.886719 L 1063.789062 692.335938 L 1063.867188 691.746094 L 1063.867188 691.550781 L 1063.886719 691.492188 L 1063.886719 691.097656 L 1059.53125 691.097656 L 1059.53125 689.488281 L 1065.5 689.488281 L 1065.5 697.125 L 1064.339844 697.125 L 1063.886719 695.222656 L 1063.261719 695.851562 L 1062.59375 696.378906 L 1061.90625 696.8125 L 1061.179688 697.105469 L 1060.433594 697.324219 L 1059.667969 697.460938 L 1059.429688 697.460938 L 1059.332031 697.480469 L 1059.097656 697.480469 L 1059 697.5 L 1058.175781 697.441406 L 1057.390625 697.304688 L 1056.644531 697.085938 L 1055.957031 696.773438 L 1055.308594 696.359375 L 1054.699219 695.851562 L 1054.148438 695.300781 L 1053.679688 694.671875 L 1053.285156 694.003906 L 1052.972656 693.257812 L 1052.714844 692.453125 L 1052.558594 691.589844 L 1052.519531 691.355469 L 1052.480469 691.097656 L 1052.460938 690.84375 L 1052.441406 690.570312 L 1052.441406 690.039062 L 1052.460938 689.3125 L 1052.539062 688.605469 L 1052.65625 687.917969 L 1052.851562 687.25 L 1053.070312 686.601562 L 1053.363281 685.953125 L 1053.855469 685.128906 L 1054.425781 684.402344 L 1055.113281 683.792969 L 1055.859375 683.304688 L 1056.703125 682.929688 L 1057.644531 682.65625 L 1057.898438 682.617188 L 1058.175781 682.578125 L 1058.449219 682.558594 L 1058.722656 682.519531 L 1059.019531 682.519531 L 1059.3125 682.5 L 1060.257812 682.558594 L 1061.140625 682.695312 L 1061.945312 682.929688 L 1062.671875 683.265625 L 1063.320312 683.695312 L 1063.90625 684.207031 L 1064.242188 684.597656 L 1064.535156 685.03125 L 1064.792969 685.503906 L 1065.007812 685.992188 L 1065.164062 686.523438 L 1065.300781 687.074219 L 1063.4375 687.074219 L 1063.28125 686.5625 L 1063.082031 686.09375 L 1062.808594 685.660156 L 1062.496094 685.285156 L 1062.101562 684.953125 L 1061.667969 684.660156 L 1061.316406 684.5 L 1060.941406 684.363281 L 1060.550781 684.246094 L 1060.15625 684.1875 L 1059.726562 684.128906 L 1059.292969 684.109375 L 1058.566406 684.167969 L 1057.898438 684.285156 L 1057.292969 684.480469 L 1056.722656 684.777344 L 1056.191406 685.148438 L 1055.71875 685.601562 L 1055.289062 686.152344 L 1054.933594 686.757812 L 1054.660156 687.425781 L 1054.445312 688.152344 L 1054.304688 688.9375 L 1054.265625 689.785156 Z M 1054.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1079.519531 682.734375 L 1079.519531 697.046875 L 1077.457031 697.046875 L 1070.054688 685.445312 L 1070.054688 697.046875 L 1068.324219 697.046875 L 1068.324219 682.734375 L 1070.308594 682.734375 L 1077.789062 694.4375 L 1077.789062 682.734375 Z M 1079.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1082.738281 697.046875 L 1082.738281 682.734375 L 1088.257812 682.734375 L 1089.121094 682.792969 L 1089.925781 682.949219 L 1090.671875 683.226562 L 1091.359375 683.578125 L 1091.96875 684.070312 L 1092.535156 684.640625 L 1093.007812 685.324219 L 1093.402344 686.070312 L 1093.695312 686.917969 L 1093.910156 687.820312 L 1094.027344 688.820312 L 1094.085938 689.882812 L 1094.027344 691 L 1093.890625 692.042969 L 1093.65625 692.984375 L 1093.339844 693.847656 L 1092.929688 694.613281 L 1092.417969 695.28125 L 1091.867188 695.832031 L 1091.261719 696.261719 L 1090.59375 696.617188 L 1089.867188 696.851562 L 1089.082031 697.007812 L 1088.257812 697.046875 Z M 1084.566406 695.4375 L 1087.941406 695.4375 L 1088.84375 695.378906 L 1089.648438 695.164062 L 1090.355469 694.789062 L 1090.945312 694.300781 L 1091.417969 693.632812 L 1091.808594 692.828125 L 1091.929688 692.414062 L 1092.046875 691.984375 L 1092.144531 691.511719 L 1092.203125 691 L 1092.242188 690.46875 L 1092.261719 689.902344 L 1092.183594 688.625 L 1091.988281 687.503906 L 1091.632812 686.542969 L 1091.160156 685.777344 L 1090.554688 685.148438 L 1089.808594 684.699219 L 1089.53125 684.597656 L 1089.238281 684.5 L 1088.921875 684.441406 L 1088.609375 684.382812 L 1088.277344 684.363281 L 1087.941406 684.34375 L 1084.566406 684.34375 Z M 1084.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 399 L 1075 399 M 1055 380 L 1075 380 M 1055 380 L 1055 399 M 1075 380 L 1075 399 " 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 1055 399 L 1075 399 M 1055 380 L 1075 380 M 1075 399 L 1075 380 M 1055 399 L 1055 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1044.195312 385.5 L 1042.234375 385.5 L 1037.089844 371.1875 L 1039.050781 371.1875 L 1043.253906 383.300781 L 1047.222656 371.1875 L 1049.164062 371.1875 Z M 1044.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1061.691406 375.386719 L 1061.652344 376.015625 L 1061.554688 376.585938 L 1061.378906 377.117188 L 1061.160156 377.585938 L 1060.847656 378.019531 L 1060.496094 378.410156 L 1060.101562 378.746094 L 1059.6875 379 L 1059.238281 379.195312 L 1058.746094 379.335938 L 1058.234375 379.414062 L 1057.6875 379.433594 L 1053.191406 379.433594 L 1053.191406 385.5 L 1051.363281 385.5 L 1051.363281 371.1875 L 1057.273438 371.1875 L 1058.117188 371.246094 L 1058.882812 371.382812 L 1059.550781 371.617188 L 1060.140625 371.953125 L 1060.632812 372.363281 L 1061.042969 372.875 L 1061.242188 373.246094 L 1061.398438 373.621094 L 1061.515625 374.011719 L 1061.613281 374.445312 L 1061.671875 374.917969 Z M 1053.191406 377.824219 L 1057 377.824219 L 1057.53125 377.804688 L 1058 377.703125 L 1058.433594 377.566406 L 1058.804688 377.351562 L 1059.121094 377.078125 L 1059.394531 376.742188 L 1059.492188 376.546875 L 1059.589844 376.3125 L 1059.667969 376.09375 L 1059.730469 375.839844 L 1059.769531 375.585938 L 1059.789062 375.308594 L 1059.75 374.839844 L 1059.648438 374.40625 L 1059.492188 374.03125 L 1059.277344 373.699219 L 1058.984375 373.425781 L 1058.648438 373.1875 L 1058.414062 373.089844 L 1058.15625 372.992188 L 1057.882812 372.914062 L 1057.609375 372.855469 L 1057.3125 372.816406 L 1057 372.796875 L 1053.191406 372.796875 Z M 1053.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1077.261719 385.5 L 1075.261719 385.5 L 1071.960938 373.738281 L 1068.761719 385.5 L 1066.757812 385.5 L 1063.085938 371.1875 L 1065.128906 371.1875 L 1067.820312 382.808594 L 1071 371.1875 L 1072.960938 371.1875 L 1076.222656 382.808594 L 1078.851562 371.1875 L 1080.894531 371.1875 Z M 1077.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1091.695312 378.429688 L 1092.148438 378.6875 L 1092.558594 378.960938 L 1092.914062 379.277344 L 1093.1875 379.648438 L 1093.382812 380.042969 L 1093.539062 380.472656 L 1093.621094 380.964844 L 1093.640625 381.257812 L 1093.660156 381.59375 L 1093.660156 382.378906 L 1093.640625 382.789062 L 1093.660156 383.144531 L 1093.679688 383.457031 L 1093.71875 383.734375 L 1093.757812 383.96875 L 1093.835938 384.164062 L 1093.894531 384.359375 L 1093.992188 384.519531 L 1094.089844 384.675781 L 1094.207031 384.8125 L 1094.347656 384.949219 L 1094.503906 385.046875 L 1094.503906 385.5 L 1092.285156 385.5 L 1092.167969 385.1875 L 1092.066406 384.851562 L 1091.988281 384.460938 L 1091.929688 384.066406 L 1091.890625 383.632812 L 1091.890625 381.886719 L 1091.851562 381.316406 L 1091.753906 380.808594 L 1091.597656 380.375 L 1091.359375 380.023438 L 1091.066406 379.746094 L 1090.714844 379.53125 L 1090.535156 379.472656 L 1090.359375 379.433594 L 1090.164062 379.394531 L 1089.96875 379.375 L 1089.75 379.355469 L 1089.535156 379.335938 L 1084.824219 379.335938 L 1084.824219 385.5 L 1082.996094 385.5 L 1082.996094 371.1875 L 1089.59375 371.1875 L 1090.476562 371.246094 L 1091.28125 371.382812 L 1091.96875 371.636719 L 1092.558594 371.972656 L 1093.050781 372.402344 L 1093.441406 372.933594 L 1093.578125 373.246094 L 1093.71875 373.5625 L 1093.816406 373.894531 L 1093.894531 374.25 L 1093.933594 374.621094 L 1093.953125 375.015625 L 1093.914062 375.542969 L 1093.835938 376.035156 L 1093.699219 376.488281 L 1093.5 376.898438 L 1093.265625 377.273438 L 1092.972656 377.585938 L 1092.792969 377.742188 L 1092.597656 377.902344 L 1092.402344 378.039062 L 1092.1875 378.175781 L 1091.949219 378.3125 Z M 1092.046875 375.269531 L 1091.988281 374.679688 L 1091.871094 374.171875 L 1091.636719 373.738281 L 1091.339844 373.386719 L 1090.929688 373.128906 L 1090.457031 372.933594 L 1090.28125 372.894531 L 1090.085938 372.855469 L 1089.886719 372.835938 L 1089.671875 372.816406 L 1089.457031 372.816406 L 1089.242188 372.796875 L 1084.824219 372.796875 L 1084.824219 377.722656 L 1089.242188 377.722656 L 1089.886719 377.703125 L 1090.457031 377.585938 L 1090.929688 377.410156 L 1091.320312 377.15625 L 1091.636719 376.839844 L 1091.851562 376.449219 L 1091.910156 376.292969 L 1091.949219 376.09375 L 1091.988281 375.917969 L 1092.007812 375.703125 L 1092.027344 375.503906 Z M 1092.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 711 L 1075 711 M 1055 691 L 1075 691 M 1055 691 L 1055 711 M 1075 691 L 1075 711 " 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 1055 711 L 1075 711 M 1055 691 L 1075 691 M 1075 711 L 1075 691 M 1055 711 L 1055 691 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1160 536 L 1180 536 M 1160 516 L 1180 516 M 1160 516 L 1160 536 M 1180 516 L 1180 536 M 1055 536 L 1075 536 M 1055 516 L 1075 516 M 1055 516 L 1055 536 M 1075 516 L 1075 536 M 1038 387 L 1038 392 M 1035 390 L 1040 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 644.726562 594.679688 L 644.726562 601.5 L 642.511719 601.5 L 642.511719 594.679688 L 635.808594 584.117188 L 638.550781 584.117188 L 643.652344 592.582031 L 648.613281 584.117188 L 651.261719 584.117188 Z M 644.726562 594.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 497 L 652 497 M 633 477 L 652 477 M 633 477 L 633 497 M 652 477 L 652 497 " 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 633 497 L 652 497 M 633 477 L 652 477 M 652 497 L 652 477 M 633 497 L 633 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 644.726562 555.679688 L 644.726562 562.5 L 642.511719 562.5 L 642.511719 555.679688 L 635.808594 545.117188 L 638.550781 545.117188 L 643.652344 553.582031 L 648.613281 545.117188 L 651.261719 545.117188 Z M 644.726562 555.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 536 L 652 536 M 633 516 L 652 516 M 633 516 L 633 536 M 652 516 L 652 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 633 536 L 652 536 M 633 516 L 652 516 M 652 536 L 652 516 M 633 536 L 633 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 644.726562 516.679688 L 644.726562 523.5 L 642.511719 523.5 L 642.511719 516.679688 L 635.808594 506.117188 L 638.550781 506.117188 L 643.652344 514.582031 L 648.613281 506.117188 L 651.261719 506.117188 Z M 644.726562 516.679688 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 574 L 652 574 M 633 555 L 652 555 M 633 555 L 633 574 M 652 555 L 652 574 " 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 633 574 L 652 574 M 633 555 L 652 555 M 652 574 L 652 555 M 633 574 L 633 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 698.800781 557.277344 L 692.101562 557.277344 L 690.265625 562.5 L 687.90625 562.5 L 694.105469 545.117188 L 696.964844 545.117188 L 703.070312 562.5 L 700.589844 562.5 Z M 698.179688 555.417969 L 695.511719 547.503906 L 692.648438 555.417969 Z M 698.179688 555.417969 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 686 536 L 705 536 M 686 516 L 705 516 M 686 516 L 686 536 M 705 516 L 705 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 686 536 L 705 536 M 686 516 L 705 516 M 705 536 L 705 516 M 686 536 L 686 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 808.355469 557.539062 L 808.304688 558.304688 L 808.1875 558.996094 L 807.972656 559.640625 L 807.6875 560.210938 L 807.304688 560.757812 L 806.851562 561.234375 L 806.351562 561.640625 L 805.828125 561.953125 L 805.230469 562.191406 L 804.609375 562.378906 L 803.941406 562.476562 L 803.226562 562.5 L 795.382812 562.5 L 795.382812 545.117188 L 802.441406 545.117188 L 803.464844 545.191406 L 804.371094 545.355469 L 805.183594 545.644531 L 805.875 546.046875 L 806.46875 546.574219 L 806.949219 547.214844 L 807.136719 547.574219 L 807.304688 547.957031 L 807.425781 548.3125 L 807.519531 548.71875 L 807.566406 549.125 L 807.589844 549.53125 L 807.519531 550.386719 L 807.304688 551.125 L 806.972656 551.820312 L 806.496094 552.390625 L 805.898438 552.914062 L 805.183594 553.320312 L 805.875 553.628906 L 806.46875 553.964844 L 806.996094 554.347656 L 807.425781 554.773438 L 807.757812 555.226562 L 808.019531 555.703125 L 808.117188 555.992188 L 808.257812 556.5625 L 808.304688 556.898438 L 808.332031 557.207031 Z M 805.375 549.839844 L 805.300781 549.125 L 805.085938 548.527344 L 804.753906 548.003906 L 804.277344 547.621094 L 803.679688 547.335938 L 802.941406 547.144531 L 802.773438 547.144531 L 802.609375 547.121094 L 802.441406 547.097656 L 802.058594 547.097656 L 801.894531 547.074219 L 797.601562 547.074219 L 797.601562 552.605469 L 801.894531 552.605469 L 802.773438 552.558594 L 803.539062 552.414062 L 804.179688 552.152344 L 804.660156 551.792969 L 805.039062 551.316406 L 805.277344 550.746094 L 805.300781 550.625 L 805.324219 550.484375 L 805.351562 550.339844 L 805.351562 550.007812 Z M 803.011719 560.542969 L 803.679688 560.519531 L 804.277344 560.378906 L 804.800781 560.140625 L 805.230469 559.828125 L 805.589844 559.425781 L 805.875 558.921875 L 805.945312 558.734375 L 805.992188 558.519531 L 806.066406 558.28125 L 806.089844 558.066406 L 806.113281 557.828125 L 806.136719 557.566406 L 806.089844 557.039062 L 805.992188 556.539062 L 805.828125 556.109375 L 805.589844 555.703125 L 805.277344 555.371094 L 804.921875 555.0625 L 804.660156 554.917969 L 804.371094 554.796875 L 804.0625 554.703125 L 803.730469 554.632812 L 803.371094 554.585938 L 803.011719 554.558594 L 797.601562 554.558594 L 797.601562 560.542969 Z M 803.011719 560.542969 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 791 536 L 810 536 M 791 516 L 810 516 M 791 516 L 791 536 M 810 516 L 810 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 791 536 L 810 536 M 791 516 L 810 516 M 810 536 L 810 516 M 791 536 L 791 516 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 842.195312 385.5 L 840.234375 385.5 L 835.089844 371.1875 L 837.050781 371.1875 L 841.253906 383.300781 L 845.222656 371.1875 L 847.164062 371.1875 Z M 842.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 859.691406 375.386719 L 859.652344 376.015625 L 859.554688 376.585938 L 859.378906 377.117188 L 859.160156 377.585938 L 858.847656 378.019531 L 858.496094 378.410156 L 858.101562 378.746094 L 857.6875 379 L 857.238281 379.195312 L 856.746094 379.335938 L 856.234375 379.414062 L 855.6875 379.433594 L 851.191406 379.433594 L 851.191406 385.5 L 849.363281 385.5 L 849.363281 371.1875 L 855.273438 371.1875 L 856.117188 371.246094 L 856.882812 371.382812 L 857.550781 371.617188 L 858.140625 371.953125 L 858.632812 372.363281 L 859.042969 372.875 L 859.242188 373.246094 L 859.398438 373.621094 L 859.515625 374.011719 L 859.613281 374.445312 L 859.671875 374.917969 Z M 851.191406 377.824219 L 855 377.824219 L 855.53125 377.804688 L 856 377.703125 L 856.433594 377.566406 L 856.804688 377.351562 L 857.121094 377.078125 L 857.394531 376.742188 L 857.492188 376.546875 L 857.589844 376.3125 L 857.667969 376.09375 L 857.730469 375.839844 L 857.769531 375.585938 L 857.789062 375.308594 L 857.75 374.839844 L 857.648438 374.40625 L 857.492188 374.03125 L 857.277344 373.699219 L 856.984375 373.425781 L 856.648438 373.1875 L 856.414062 373.089844 L 856.15625 372.992188 L 855.882812 372.914062 L 855.609375 372.855469 L 855.3125 372.816406 L 855 372.796875 L 851.191406 372.796875 Z M 851.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 872.886719 381.414062 L 872.847656 382.042969 L 872.75 382.613281 L 872.574219 383.144531 L 872.335938 383.613281 L 872.023438 384.066406 L 871.648438 384.460938 L 871.238281 384.792969 L 870.804688 385.046875 L 870.316406 385.246094 L 869.804688 385.402344 L 869.253906 385.480469 L 868.664062 385.5 L 862.207031 385.5 L 862.207031 371.1875 L 868.015625 371.1875 L 868.863281 371.246094 L 869.609375 371.382812 L 870.277344 371.617188 L 870.84375 371.953125 L 871.335938 372.382812 L 871.730469 372.914062 L 871.886719 373.207031 L 872.023438 373.523438 L 872.121094 373.816406 L 872.199219 374.152344 L 872.238281 374.484375 L 872.257812 374.820312 L 872.199219 375.523438 L 872.023438 376.132812 L 871.75 376.703125 L 871.355469 377.175781 L 870.863281 377.605469 L 870.277344 377.941406 L 870.84375 378.195312 L 871.335938 378.46875 L 871.769531 378.785156 L 872.121094 379.136719 L 872.394531 379.511719 L 872.613281 379.902344 L 872.691406 380.140625 L 872.808594 380.609375 L 872.847656 380.886719 L 872.867188 381.140625 Z M 870.433594 375.074219 L 870.375 374.484375 L 870.195312 373.992188 L 869.921875 373.5625 L 869.53125 373.246094 L 869.039062 373.011719 L 868.429688 372.855469 L 868.292969 372.855469 L 868.15625 372.835938 L 868.015625 372.816406 L 867.703125 372.816406 L 867.566406 372.796875 L 864.03125 372.796875 L 864.03125 377.351562 L 867.566406 377.351562 L 868.292969 377.3125 L 868.921875 377.195312 L 869.449219 376.976562 L 869.84375 376.683594 L 870.15625 376.292969 L 870.355469 375.820312 L 870.375 375.722656 L 870.394531 375.605469 L 870.414062 375.484375 L 870.414062 375.210938 Z M 868.488281 383.890625 L 869.039062 383.871094 L 869.53125 383.753906 L 869.960938 383.554688 L 870.316406 383.300781 L 870.609375 382.96875 L 870.84375 382.554688 L 870.902344 382.398438 L 870.941406 382.222656 L 871.003906 382.023438 L 871.023438 381.847656 L 871.042969 381.652344 L 871.0625 381.433594 L 871.023438 381.003906 L 870.941406 380.589844 L 870.804688 380.238281 L 870.609375 379.902344 L 870.355469 379.628906 L 870.058594 379.375 L 869.84375 379.257812 L 869.609375 379.15625 L 869.351562 379.078125 L 869.078125 379.019531 L 868.785156 378.980469 L 868.488281 378.960938 L 864.03125 378.960938 L 864.03125 383.890625 Z M 868.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 844 711 L 863 711 M 844 691 L 863 691 M 844 691 L 844 711 M 863 691 L 863 711 " 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 844 711 L 863 711 M 844 691 L 863 691 M 863 711 L 863 691 M 844 711 L 844 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 842.195312 696.5 L 840.234375 696.5 L 835.089844 682.1875 L 837.050781 682.1875 L 841.253906 694.300781 L 845.222656 682.1875 L 847.164062 682.1875 Z M 842.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 860.261719 682.1875 L 860.261719 696.5 L 858.199219 696.5 L 850.796875 684.894531 L 850.796875 696.5 L 849.070312 696.5 L 849.070312 682.1875 L 851.050781 682.1875 L 858.535156 693.886719 L 858.535156 682.1875 Z M 860.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 873.96875 692.414062 L 873.929688 693.042969 L 873.828125 693.613281 L 873.652344 694.144531 L 873.417969 694.613281 L 873.101562 695.066406 L 872.730469 695.460938 L 872.316406 695.792969 L 871.886719 696.046875 L 871.394531 696.246094 L 870.882812 696.402344 L 870.335938 696.480469 L 869.746094 696.5 L 863.285156 696.5 L 863.285156 682.1875 L 869.097656 682.1875 L 869.941406 682.246094 L 870.6875 682.382812 L 871.355469 682.617188 L 871.925781 682.953125 L 872.414062 683.382812 L 872.808594 683.914062 L 872.964844 684.207031 L 873.101562 684.523438 L 873.203125 684.816406 L 873.28125 685.152344 L 873.320312 685.484375 L 873.339844 685.820312 L 873.28125 686.523438 L 873.101562 687.132812 L 872.828125 687.703125 L 872.433594 688.175781 L 871.945312 688.605469 L 871.355469 688.941406 L 871.925781 689.195312 L 872.414062 689.46875 L 872.847656 689.785156 L 873.203125 690.136719 L 873.476562 690.511719 L 873.691406 690.902344 L 873.769531 691.140625 L 873.886719 691.609375 L 873.929688 691.886719 L 873.949219 692.140625 Z M 871.511719 686.074219 L 871.453125 685.484375 L 871.277344 684.992188 L 871.003906 684.5625 L 870.609375 684.246094 L 870.117188 684.011719 L 869.511719 683.855469 L 869.371094 683.855469 L 869.097656 683.816406 L 868.785156 683.816406 L 868.644531 683.796875 L 865.113281 683.796875 L 865.113281 688.351562 L 868.644531 688.351562 L 869.371094 688.3125 L 870 688.195312 L 870.53125 687.976562 L 870.921875 687.683594 L 871.238281 687.292969 L 871.433594 686.820312 L 871.453125 686.722656 L 871.472656 686.605469 L 871.492188 686.484375 L 871.492188 686.210938 Z M 869.570312 694.890625 L 870.117188 694.871094 L 870.609375 694.753906 L 871.042969 694.554688 L 871.394531 694.300781 L 871.6875 693.96875 L 871.925781 693.554688 L 871.984375 693.398438 L 872.023438 693.222656 L 872.082031 693.023438 L 872.101562 692.847656 L 872.121094 692.652344 L 872.140625 692.433594 L 872.101562 692.003906 L 872.023438 691.589844 L 871.886719 691.238281 L 871.6875 690.902344 L 871.433594 690.628906 L 871.140625 690.375 L 870.921875 690.257812 L 870.6875 690.15625 L 870.433594 690.078125 L 870.15625 690.019531 L 869.863281 689.980469 L 869.570312 689.960938 L 865.113281 689.960938 L 865.113281 694.890625 Z M 869.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 844 399 L 863 399 M 844 380 L 863 380 M 844 380 L 844 399 M 863 380 L 863 399 " 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 844 399 L 863 399 M 844 380 L 863 380 M 863 399 L 863 380 M 844 399 L 844 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 834.195312 697.046875 L 832.234375 697.046875 L 827.089844 682.734375 L 829.050781 682.734375 L 833.253906 694.847656 L 837.222656 682.734375 L 839.164062 682.734375 Z M 834.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 842.265625 689.941406 L 842.285156 690.609375 L 842.347656 691.234375 L 842.464844 691.824219 L 842.621094 692.414062 L 842.835938 692.964844 L 843.113281 693.476562 L 843.582031 694.203125 L 844.152344 694.789062 L 844.800781 695.261719 L 845.527344 695.59375 L 846.351562 695.8125 L 847.253906 695.890625 L 847.390625 695.890625 L 848 695.871094 L 848.589844 695.773438 L 849.121094 695.59375 L 849.628906 695.378906 L 850.101562 695.085938 L 850.554688 694.710938 L 850.925781 694.320312 L 851.242188 693.886719 L 851.496094 693.394531 L 851.671875 692.886719 L 851.789062 692.335938 L 851.867188 691.746094 L 851.867188 691.550781 L 851.886719 691.492188 L 851.886719 691.097656 L 847.53125 691.097656 L 847.53125 689.488281 L 853.5 689.488281 L 853.5 697.125 L 852.339844 697.125 L 851.886719 695.222656 L 851.261719 695.851562 L 850.59375 696.378906 L 849.90625 696.8125 L 849.179688 697.105469 L 848.433594 697.324219 L 847.667969 697.460938 L 847.429688 697.460938 L 847.332031 697.480469 L 847.097656 697.480469 L 847 697.5 L 846.175781 697.441406 L 845.390625 697.304688 L 844.644531 697.085938 L 843.957031 696.773438 L 843.308594 696.359375 L 842.699219 695.851562 L 842.148438 695.300781 L 841.679688 694.671875 L 841.285156 694.003906 L 840.972656 693.257812 L 840.714844 692.453125 L 840.558594 691.589844 L 840.519531 691.355469 L 840.480469 691.097656 L 840.460938 690.84375 L 840.441406 690.570312 L 840.441406 690.039062 L 840.460938 689.3125 L 840.539062 688.605469 L 840.65625 687.917969 L 840.851562 687.25 L 841.070312 686.601562 L 841.363281 685.953125 L 841.855469 685.128906 L 842.425781 684.402344 L 843.113281 683.792969 L 843.859375 683.304688 L 844.703125 682.929688 L 845.644531 682.65625 L 845.898438 682.617188 L 846.175781 682.578125 L 846.449219 682.558594 L 846.722656 682.519531 L 847.019531 682.519531 L 847.3125 682.5 L 848.257812 682.558594 L 849.140625 682.695312 L 849.945312 682.929688 L 850.671875 683.265625 L 851.320312 683.695312 L 851.90625 684.207031 L 852.242188 684.597656 L 852.535156 685.03125 L 852.792969 685.503906 L 853.007812 685.992188 L 853.164062 686.523438 L 853.300781 687.074219 L 851.4375 687.074219 L 851.28125 686.5625 L 851.082031 686.09375 L 850.808594 685.660156 L 850.496094 685.285156 L 850.101562 684.953125 L 849.667969 684.660156 L 849.316406 684.5 L 848.941406 684.363281 L 848.550781 684.246094 L 848.15625 684.1875 L 847.726562 684.128906 L 847.292969 684.109375 L 846.566406 684.167969 L 845.898438 684.285156 L 845.292969 684.480469 L 844.722656 684.777344 L 844.191406 685.148438 L 843.71875 685.601562 L 843.289062 686.152344 L 842.933594 686.757812 L 842.660156 687.425781 L 842.445312 688.152344 L 842.304688 688.9375 L 842.265625 689.785156 Z M 842.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 867.519531 682.734375 L 867.519531 697.046875 L 865.457031 697.046875 L 858.054688 685.445312 L 858.054688 697.046875 L 856.324219 697.046875 L 856.324219 682.734375 L 858.308594 682.734375 L 865.789062 694.4375 L 865.789062 682.734375 Z M 867.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 870.738281 697.046875 L 870.738281 682.734375 L 876.257812 682.734375 L 877.121094 682.792969 L 877.925781 682.949219 L 878.671875 683.226562 L 879.359375 683.578125 L 879.96875 684.070312 L 880.535156 684.640625 L 881.007812 685.324219 L 881.402344 686.070312 L 881.695312 686.917969 L 881.910156 687.820312 L 882.027344 688.820312 L 882.085938 689.882812 L 882.027344 691 L 881.890625 692.042969 L 881.65625 692.984375 L 881.339844 693.847656 L 880.929688 694.613281 L 880.417969 695.28125 L 879.867188 695.832031 L 879.261719 696.261719 L 878.59375 696.617188 L 877.867188 696.851562 L 877.082031 697.007812 L 876.257812 697.046875 Z M 872.566406 695.4375 L 875.941406 695.4375 L 876.84375 695.378906 L 877.648438 695.164062 L 878.355469 694.789062 L 878.945312 694.300781 L 879.417969 693.632812 L 879.808594 692.828125 L 879.929688 692.414062 L 880.046875 691.984375 L 880.144531 691.511719 L 880.203125 691 L 880.242188 690.46875 L 880.261719 689.902344 L 880.183594 688.625 L 879.988281 687.503906 L 879.632812 686.542969 L 879.160156 685.777344 L 878.554688 685.148438 L 877.808594 684.699219 L 877.53125 684.597656 L 877.238281 684.5 L 876.921875 684.441406 L 876.609375 684.382812 L 876.277344 684.363281 L 875.941406 684.34375 L 872.566406 684.34375 Z M 872.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 844 399 L 863 399 M 844 380 L 863 380 M 844 380 L 844 399 M 863 380 L 863 399 " 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 844 399 L 863 399 M 844 380 L 863 380 M 863 399 L 863 380 M 844 399 L 844 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 832.195312 385.5 L 830.234375 385.5 L 825.089844 371.1875 L 827.050781 371.1875 L 831.253906 383.300781 L 835.222656 371.1875 L 837.164062 371.1875 Z M 832.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 849.691406 375.386719 L 849.652344 376.015625 L 849.554688 376.585938 L 849.378906 377.117188 L 849.160156 377.585938 L 848.847656 378.019531 L 848.496094 378.410156 L 848.101562 378.746094 L 847.6875 379 L 847.238281 379.195312 L 846.746094 379.335938 L 846.234375 379.414062 L 845.6875 379.433594 L 841.191406 379.433594 L 841.191406 385.5 L 839.363281 385.5 L 839.363281 371.1875 L 845.273438 371.1875 L 846.117188 371.246094 L 846.882812 371.382812 L 847.550781 371.617188 L 848.140625 371.953125 L 848.632812 372.363281 L 849.042969 372.875 L 849.242188 373.246094 L 849.398438 373.621094 L 849.515625 374.011719 L 849.613281 374.445312 L 849.671875 374.917969 Z M 841.191406 377.824219 L 845 377.824219 L 845.53125 377.804688 L 846 377.703125 L 846.433594 377.566406 L 846.804688 377.351562 L 847.121094 377.078125 L 847.394531 376.742188 L 847.492188 376.546875 L 847.589844 376.3125 L 847.667969 376.09375 L 847.730469 375.839844 L 847.769531 375.585938 L 847.789062 375.308594 L 847.75 374.839844 L 847.648438 374.40625 L 847.492188 374.03125 L 847.277344 373.699219 L 846.984375 373.425781 L 846.648438 373.1875 L 846.414062 373.089844 L 846.15625 372.992188 L 845.882812 372.914062 L 845.609375 372.855469 L 845.3125 372.816406 L 845 372.796875 L 841.191406 372.796875 Z M 841.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 865.261719 385.5 L 863.261719 385.5 L 859.960938 373.738281 L 856.761719 385.5 L 854.757812 385.5 L 851.085938 371.1875 L 853.128906 371.1875 L 855.820312 382.808594 L 859 371.1875 L 860.960938 371.1875 L 864.222656 382.808594 L 866.851562 371.1875 L 868.894531 371.1875 Z M 865.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 879.695312 378.429688 L 880.148438 378.6875 L 880.558594 378.960938 L 880.914062 379.277344 L 881.1875 379.648438 L 881.382812 380.042969 L 881.539062 380.472656 L 881.621094 380.964844 L 881.640625 381.257812 L 881.660156 381.59375 L 881.660156 382.378906 L 881.640625 382.789062 L 881.660156 383.144531 L 881.679688 383.457031 L 881.71875 383.734375 L 881.757812 383.96875 L 881.835938 384.164062 L 881.894531 384.359375 L 881.992188 384.519531 L 882.089844 384.675781 L 882.207031 384.8125 L 882.347656 384.949219 L 882.503906 385.046875 L 882.503906 385.5 L 880.285156 385.5 L 880.167969 385.1875 L 880.066406 384.851562 L 879.988281 384.460938 L 879.929688 384.066406 L 879.890625 383.632812 L 879.890625 381.886719 L 879.851562 381.316406 L 879.753906 380.808594 L 879.597656 380.375 L 879.359375 380.023438 L 879.066406 379.746094 L 878.714844 379.53125 L 878.535156 379.472656 L 878.359375 379.433594 L 878.164062 379.394531 L 877.96875 379.375 L 877.75 379.355469 L 877.535156 379.335938 L 872.824219 379.335938 L 872.824219 385.5 L 870.996094 385.5 L 870.996094 371.1875 L 877.59375 371.1875 L 878.476562 371.246094 L 879.28125 371.382812 L 879.96875 371.636719 L 880.558594 371.972656 L 881.050781 372.402344 L 881.441406 372.933594 L 881.578125 373.246094 L 881.71875 373.5625 L 881.816406 373.894531 L 881.894531 374.25 L 881.933594 374.621094 L 881.953125 375.015625 L 881.914062 375.542969 L 881.835938 376.035156 L 881.699219 376.488281 L 881.5 376.898438 L 881.265625 377.273438 L 880.972656 377.585938 L 880.792969 377.742188 L 880.597656 377.902344 L 880.402344 378.039062 L 880.1875 378.175781 L 879.949219 378.3125 Z M 880.046875 375.269531 L 879.988281 374.679688 L 879.871094 374.171875 L 879.636719 373.738281 L 879.339844 373.386719 L 878.929688 373.128906 L 878.457031 372.933594 L 878.28125 372.894531 L 878.085938 372.855469 L 877.886719 372.835938 L 877.671875 372.816406 L 877.457031 372.816406 L 877.242188 372.796875 L 872.824219 372.796875 L 872.824219 377.722656 L 877.242188 377.722656 L 877.886719 377.703125 L 878.457031 377.585938 L 878.929688 377.410156 L 879.320312 377.15625 L 879.636719 376.839844 L 879.851562 376.449219 L 879.910156 376.292969 L 879.949219 376.09375 L 879.988281 375.917969 L 880.007812 375.703125 L 880.027344 375.503906 Z M 880.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 844 711 L 863 711 M 844 691 L 863 691 M 844 691 L 844 711 M 863 691 L 863 711 " 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 844 711 L 863 711 M 844 691 L 863 691 M 863 711 L 863 691 M 844 711 L 844 691 " 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%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 738 536 L 758 536 M 738 516 L 758 516 M 738 516 L 738 536 M 758 516 L 758 536 M 844 536 L 863 536 M 844 516 L 863 516 M 844 516 L 844 536 M 863 516 L 863 536 M 880 387 L 880 392 M 877 390 L 882 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 991.898438 507.734375 L 991.898438 520.4375 L 998.964844 520.4375 L 998.964844 522.046875 L 990.070312 522.046875 L 990.070312 507.734375 Z M 991.898438 507.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 1013.96875 515.117188 L 1013.90625 516.019531 L 1013.789062 516.882812 L 1013.59375 517.6875 L 1013.320312 518.457031 L 1012.964844 519.179688 L 1012.535156 519.847656 L 1012.023438 520.476562 L 1011.453125 521.007812 L 1010.84375 521.460938 L 1010.175781 521.832031 L 1009.449219 522.105469 L 1008.683594 522.324219 L 1008.410156 522.363281 L 1008.136719 522.421875 L 1007.878906 522.441406 L 1007.605469 522.480469 L 1007.332031 522.480469 L 1007.054688 522.5 L 1006.152344 522.441406 L 1005.308594 522.304688 L 1004.523438 522.066406 L 1003.777344 521.753906 L 1003.070312 521.339844 L 1002.441406 520.8125 L 1001.871094 520.242188 L 1001.378906 519.59375 L 1000.988281 518.886719 L 1000.652344 518.121094 L 1000.398438 517.296875 L 1000.242188 516.394531 L 1000.203125 516.175781 L 1000.183594 515.941406 L 1000.164062 515.726562 L 1000.144531 515.488281 L 1000.144531 515 L 1000.183594 514.015625 L 1000.320312 513.074219 L 1000.535156 512.210938 L 1000.851562 511.386719 L 1001.242188 510.621094 L 1001.753906 509.914062 L 1002.265625 509.34375 L 1002.851562 508.832031 L 1003.5 508.402344 L 1004.1875 508.066406 L 1004.933594 507.792969 L 1005.738281 507.597656 L 1005.9375 507.578125 L 1006.367188 507.539062 L 1006.585938 507.519531 L 1006.800781 507.519531 L 1007.035156 507.5 L 1007.957031 507.558594 L 1008.84375 507.695312 L 1009.667969 507.949219 L 1010.433594 508.285156 L 1011.140625 508.734375 L 1011.789062 509.265625 L 1012.335938 509.894531 L 1012.828125 510.582031 L 1013.222656 511.347656 L 1013.535156 512.171875 L 1013.769531 513.074219 L 1013.929688 514.039062 L 1013.929688 514.410156 L 1013.949219 514.585938 L 1013.949219 514.941406 Z M 1007.035156 509.109375 L 1006.328125 509.167969 L 1005.679688 509.285156 L 1005.050781 509.480469 L 1004.484375 509.777344 L 1003.953125 510.148438 L 1003.480469 510.582031 L 1003.03125 511.132812 L 1002.675781 511.71875 L 1002.382812 512.367188 L 1002.167969 513.074219 L 1002.027344 513.839844 L 1001.96875 514.644531 L 1001.96875 515 L 1001.988281 515.863281 L 1002.105469 516.648438 L 1002.304688 517.375 L 1002.558594 518.042969 L 1002.914062 518.671875 L 1003.34375 519.222656 L 1003.796875 519.710938 L 1004.285156 520.105469 L 1004.835938 520.417969 L 1005.425781 520.652344 L 1006.074219 520.8125 L 1006.761719 520.871094 L 1006.800781 520.890625 L 1007.054688 520.890625 L 1007.742188 520.851562 L 1008.390625 520.734375 L 1009 520.535156 L 1009.550781 520.242188 L 1010.078125 519.886719 L 1010.570312 519.4375 L 1011.003906 518.945312 L 1011.355469 518.375 L 1011.648438 517.75 L 1011.867188 517.082031 L 1012.023438 516.355469 L 1012.121094 515.570312 L 1012.121094 515.175781 L 1012.140625 515.078125 L 1012.101562 514.214844 L 1011.984375 513.390625 L 1011.789062 512.625 L 1011.511719 511.917969 L 1011.160156 511.289062 L 1010.726562 510.699219 L 1010.214844 510.226562 L 1009.667969 509.835938 L 1009.078125 509.519531 L 1008.429688 509.304688 L 1007.742188 509.167969 Z M 1007.035156 509.109375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 991 574 L 1011 574 M 991 555 L 1011 555 M 991 555 L 991 574 M 1011 555 L 1011 574 " 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 991 574 L 1011 574 M 991 555 L 1011 555 M 1011 574 L 1011 555 M 991 574 L 991 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 930.320312 551.980469 L 922.957031 551.980469 L 922.957031 558.5 L 921.128906 558.5 L 921.128906 544.1875 L 922.957031 544.1875 L 922.957031 550.371094 L 930.320312 550.371094 L 930.320312 544.1875 L 932.144531 544.1875 L 932.144531 558.5 L 930.320312 558.5 Z M 930.320312 551.980469 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 937.464844 544.1875 L 937.464844 558.5 L 935.621094 558.5 L 935.621094 544.1875 Z M 937.464844 544.1875 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 918 538 L 938 538 M 918 518 L 938 518 M 918 518 L 918 538 M 938 518 L 938 538 " 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 918 538 L 938 538 M 918 518 L 938 518 M 938 538 L 938 518 M 918 538 L 918 518 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 895.195312 385.5 L 893.234375 385.5 L 888.089844 371.1875 L 890.050781 371.1875 L 894.253906 383.300781 L 898.222656 371.1875 L 900.164062 371.1875 Z M 895.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 912.691406 375.386719 L 912.652344 376.015625 L 912.554688 376.585938 L 912.378906 377.117188 L 912.160156 377.585938 L 911.847656 378.019531 L 911.496094 378.410156 L 911.101562 378.746094 L 910.6875 379 L 910.238281 379.195312 L 909.746094 379.335938 L 909.234375 379.414062 L 908.6875 379.433594 L 904.191406 379.433594 L 904.191406 385.5 L 902.363281 385.5 L 902.363281 371.1875 L 908.273438 371.1875 L 909.117188 371.246094 L 909.882812 371.382812 L 910.550781 371.617188 L 911.140625 371.953125 L 911.632812 372.363281 L 912.042969 372.875 L 912.242188 373.246094 L 912.398438 373.621094 L 912.515625 374.011719 L 912.613281 374.445312 L 912.671875 374.917969 Z M 904.191406 377.824219 L 908 377.824219 L 908.53125 377.804688 L 909 377.703125 L 909.433594 377.566406 L 909.804688 377.351562 L 910.121094 377.078125 L 910.394531 376.742188 L 910.492188 376.546875 L 910.589844 376.3125 L 910.667969 376.09375 L 910.730469 375.839844 L 910.769531 375.585938 L 910.789062 375.308594 L 910.75 374.839844 L 910.648438 374.40625 L 910.492188 374.03125 L 910.277344 373.699219 L 909.984375 373.425781 L 909.648438 373.1875 L 909.414062 373.089844 L 909.15625 372.992188 L 908.882812 372.914062 L 908.609375 372.855469 L 908.3125 372.816406 L 908 372.796875 L 904.191406 372.796875 Z M 904.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 925.886719 381.414062 L 925.847656 382.042969 L 925.75 382.613281 L 925.574219 383.144531 L 925.335938 383.613281 L 925.023438 384.066406 L 924.648438 384.460938 L 924.238281 384.792969 L 923.804688 385.046875 L 923.316406 385.246094 L 922.804688 385.402344 L 922.253906 385.480469 L 921.664062 385.5 L 915.207031 385.5 L 915.207031 371.1875 L 921.015625 371.1875 L 921.863281 371.246094 L 922.609375 371.382812 L 923.277344 371.617188 L 923.84375 371.953125 L 924.335938 372.382812 L 924.730469 372.914062 L 924.886719 373.207031 L 925.023438 373.523438 L 925.121094 373.816406 L 925.199219 374.152344 L 925.238281 374.484375 L 925.257812 374.820312 L 925.199219 375.523438 L 925.023438 376.132812 L 924.75 376.703125 L 924.355469 377.175781 L 923.863281 377.605469 L 923.277344 377.941406 L 923.84375 378.195312 L 924.335938 378.46875 L 924.769531 378.785156 L 925.121094 379.136719 L 925.394531 379.511719 L 925.613281 379.902344 L 925.691406 380.140625 L 925.808594 380.609375 L 925.847656 380.886719 L 925.867188 381.140625 Z M 923.433594 375.074219 L 923.375 374.484375 L 923.195312 373.992188 L 922.921875 373.5625 L 922.53125 373.246094 L 922.039062 373.011719 L 921.429688 372.855469 L 921.292969 372.855469 L 921.15625 372.835938 L 921.015625 372.816406 L 920.703125 372.816406 L 920.566406 372.796875 L 917.03125 372.796875 L 917.03125 377.351562 L 920.566406 377.351562 L 921.292969 377.3125 L 921.921875 377.195312 L 922.449219 376.976562 L 922.84375 376.683594 L 923.15625 376.292969 L 923.355469 375.820312 L 923.375 375.722656 L 923.394531 375.605469 L 923.414062 375.484375 L 923.414062 375.210938 Z M 921.488281 383.890625 L 922.039062 383.871094 L 922.53125 383.753906 L 922.960938 383.554688 L 923.316406 383.300781 L 923.609375 382.96875 L 923.84375 382.554688 L 923.902344 382.398438 L 923.941406 382.222656 L 924.003906 382.023438 L 924.023438 381.847656 L 924.042969 381.652344 L 924.0625 381.433594 L 924.023438 381.003906 L 923.941406 380.589844 L 923.804688 380.238281 L 923.609375 379.902344 L 923.355469 379.628906 L 923.058594 379.375 L 922.84375 379.257812 L 922.609375 379.15625 L 922.351562 379.078125 L 922.078125 379.019531 L 921.785156 378.980469 L 921.488281 378.960938 L 917.03125 378.960938 L 917.03125 383.890625 Z M 921.488281 383.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 897 711 L 916 711 M 897 691 L 916 691 M 897 691 L 897 711 M 916 691 L 916 711 " 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 897 711 L 916 711 M 897 691 L 916 691 M 916 711 L 916 691 M 897 711 L 897 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 895.195312 696.5 L 893.234375 696.5 L 888.089844 682.1875 L 890.050781 682.1875 L 894.253906 694.300781 L 898.222656 682.1875 L 900.164062 682.1875 Z M 895.195312 696.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 913.261719 682.1875 L 913.261719 696.5 L 911.199219 696.5 L 903.796875 684.894531 L 903.796875 696.5 L 902.070312 696.5 L 902.070312 682.1875 L 904.050781 682.1875 L 911.535156 693.886719 L 911.535156 682.1875 Z M 913.261719 682.1875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 926.96875 692.414062 L 926.929688 693.042969 L 926.828125 693.613281 L 926.652344 694.144531 L 926.417969 694.613281 L 926.101562 695.066406 L 925.730469 695.460938 L 925.316406 695.792969 L 924.886719 696.046875 L 924.394531 696.246094 L 923.882812 696.402344 L 923.335938 696.480469 L 922.746094 696.5 L 916.285156 696.5 L 916.285156 682.1875 L 922.097656 682.1875 L 922.941406 682.246094 L 923.6875 682.382812 L 924.355469 682.617188 L 924.925781 682.953125 L 925.414062 683.382812 L 925.808594 683.914062 L 925.964844 684.207031 L 926.101562 684.523438 L 926.203125 684.816406 L 926.28125 685.152344 L 926.320312 685.484375 L 926.339844 685.820312 L 926.28125 686.523438 L 926.101562 687.132812 L 925.828125 687.703125 L 925.433594 688.175781 L 924.945312 688.605469 L 924.355469 688.941406 L 924.925781 689.195312 L 925.414062 689.46875 L 925.847656 689.785156 L 926.203125 690.136719 L 926.476562 690.511719 L 926.691406 690.902344 L 926.769531 691.140625 L 926.886719 691.609375 L 926.929688 691.886719 L 926.949219 692.140625 Z M 924.511719 686.074219 L 924.453125 685.484375 L 924.277344 684.992188 L 924.003906 684.5625 L 923.609375 684.246094 L 923.117188 684.011719 L 922.511719 683.855469 L 922.371094 683.855469 L 922.097656 683.816406 L 921.785156 683.816406 L 921.644531 683.796875 L 918.113281 683.796875 L 918.113281 688.351562 L 921.644531 688.351562 L 922.371094 688.3125 L 923 688.195312 L 923.53125 687.976562 L 923.921875 687.683594 L 924.238281 687.292969 L 924.433594 686.820312 L 924.453125 686.722656 L 924.472656 686.605469 L 924.492188 686.484375 L 924.492188 686.210938 Z M 922.570312 694.890625 L 923.117188 694.871094 L 923.609375 694.753906 L 924.042969 694.554688 L 924.394531 694.300781 L 924.6875 693.96875 L 924.925781 693.554688 L 924.984375 693.398438 L 925.023438 693.222656 L 925.082031 693.023438 L 925.101562 692.847656 L 925.121094 692.652344 L 925.140625 692.433594 L 925.101562 692.003906 L 925.023438 691.589844 L 924.886719 691.238281 L 924.6875 690.902344 L 924.433594 690.628906 L 924.140625 690.375 L 923.921875 690.257812 L 923.6875 690.15625 L 923.433594 690.078125 L 923.15625 690.019531 L 922.863281 689.980469 L 922.570312 689.960938 L 918.113281 689.960938 L 918.113281 694.890625 Z M 922.570312 694.890625 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 897 399 L 916 399 M 897 380 L 916 380 M 897 380 L 897 399 M 916 380 L 916 399 " 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 897 399 L 916 399 M 897 380 L 916 380 M 916 399 L 916 380 M 897 399 L 897 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 887.195312 697.046875 L 885.234375 697.046875 L 880.089844 682.734375 L 882.050781 682.734375 L 886.253906 694.847656 L 890.222656 682.734375 L 892.164062 682.734375 Z M 887.195312 697.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 895.265625 689.941406 L 895.285156 690.609375 L 895.347656 691.234375 L 895.464844 691.824219 L 895.621094 692.414062 L 895.835938 692.964844 L 896.113281 693.476562 L 896.582031 694.203125 L 897.152344 694.789062 L 897.800781 695.261719 L 898.527344 695.59375 L 899.351562 695.8125 L 900.253906 695.890625 L 900.390625 695.890625 L 901 695.871094 L 901.589844 695.773438 L 902.121094 695.59375 L 902.628906 695.378906 L 903.101562 695.085938 L 903.554688 694.710938 L 903.925781 694.320312 L 904.242188 693.886719 L 904.496094 693.394531 L 904.671875 692.886719 L 904.789062 692.335938 L 904.867188 691.746094 L 904.867188 691.550781 L 904.886719 691.492188 L 904.886719 691.097656 L 900.53125 691.097656 L 900.53125 689.488281 L 906.5 689.488281 L 906.5 697.125 L 905.339844 697.125 L 904.886719 695.222656 L 904.261719 695.851562 L 903.59375 696.378906 L 902.90625 696.8125 L 902.179688 697.105469 L 901.433594 697.324219 L 900.667969 697.460938 L 900.429688 697.460938 L 900.332031 697.480469 L 900.097656 697.480469 L 900 697.5 L 899.175781 697.441406 L 898.390625 697.304688 L 897.644531 697.085938 L 896.957031 696.773438 L 896.308594 696.359375 L 895.699219 695.851562 L 895.148438 695.300781 L 894.679688 694.671875 L 894.285156 694.003906 L 893.972656 693.257812 L 893.714844 692.453125 L 893.558594 691.589844 L 893.519531 691.355469 L 893.480469 691.097656 L 893.460938 690.84375 L 893.441406 690.570312 L 893.441406 690.039062 L 893.460938 689.3125 L 893.539062 688.605469 L 893.65625 687.917969 L 893.851562 687.25 L 894.070312 686.601562 L 894.363281 685.953125 L 894.855469 685.128906 L 895.425781 684.402344 L 896.113281 683.792969 L 896.859375 683.304688 L 897.703125 682.929688 L 898.644531 682.65625 L 898.898438 682.617188 L 899.175781 682.578125 L 899.449219 682.558594 L 899.722656 682.519531 L 900.019531 682.519531 L 900.3125 682.5 L 901.257812 682.558594 L 902.140625 682.695312 L 902.945312 682.929688 L 903.671875 683.265625 L 904.320312 683.695312 L 904.90625 684.207031 L 905.242188 684.597656 L 905.535156 685.03125 L 905.792969 685.503906 L 906.007812 685.992188 L 906.164062 686.523438 L 906.300781 687.074219 L 904.4375 687.074219 L 904.28125 686.5625 L 904.082031 686.09375 L 903.808594 685.660156 L 903.496094 685.285156 L 903.101562 684.953125 L 902.667969 684.660156 L 902.316406 684.5 L 901.941406 684.363281 L 901.550781 684.246094 L 901.15625 684.1875 L 900.726562 684.128906 L 900.292969 684.109375 L 899.566406 684.167969 L 898.898438 684.285156 L 898.292969 684.480469 L 897.722656 684.777344 L 897.191406 685.148438 L 896.71875 685.601562 L 896.289062 686.152344 L 895.933594 686.757812 L 895.660156 687.425781 L 895.445312 688.152344 L 895.304688 688.9375 L 895.265625 689.785156 Z M 895.265625 689.941406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 920.519531 682.734375 L 920.519531 697.046875 L 918.457031 697.046875 L 911.054688 685.445312 L 911.054688 697.046875 L 909.324219 697.046875 L 909.324219 682.734375 L 911.308594 682.734375 L 918.789062 694.4375 L 918.789062 682.734375 Z M 920.519531 682.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 923.738281 697.046875 L 923.738281 682.734375 L 929.257812 682.734375 L 930.121094 682.792969 L 930.925781 682.949219 L 931.671875 683.226562 L 932.359375 683.578125 L 932.96875 684.070312 L 933.535156 684.640625 L 934.007812 685.324219 L 934.402344 686.070312 L 934.695312 686.917969 L 934.910156 687.820312 L 935.027344 688.820312 L 935.085938 689.882812 L 935.027344 691 L 934.890625 692.042969 L 934.65625 692.984375 L 934.339844 693.847656 L 933.929688 694.613281 L 933.417969 695.28125 L 932.867188 695.832031 L 932.261719 696.261719 L 931.59375 696.617188 L 930.867188 696.851562 L 930.082031 697.007812 L 929.257812 697.046875 Z M 925.566406 695.4375 L 928.941406 695.4375 L 929.84375 695.378906 L 930.648438 695.164062 L 931.355469 694.789062 L 931.945312 694.300781 L 932.417969 693.632812 L 932.808594 692.828125 L 932.929688 692.414062 L 933.046875 691.984375 L 933.144531 691.511719 L 933.203125 691 L 933.242188 690.46875 L 933.261719 689.902344 L 933.183594 688.625 L 932.988281 687.503906 L 932.632812 686.542969 L 932.160156 685.777344 L 931.554688 685.148438 L 930.808594 684.699219 L 930.53125 684.597656 L 930.238281 684.5 L 929.921875 684.441406 L 929.609375 684.382812 L 929.277344 684.363281 L 928.941406 684.34375 L 925.566406 684.34375 Z M 925.566406 695.4375 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 897 399 L 916 399 M 897 380 L 916 380 M 897 380 L 897 399 M 916 380 L 916 399 " 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 897 399 L 916 399 M 897 380 L 916 380 M 916 399 L 916 380 M 897 399 L 897 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 885.195312 385.5 L 883.234375 385.5 L 878.089844 371.1875 L 880.050781 371.1875 L 884.253906 383.300781 L 888.222656 371.1875 L 890.164062 371.1875 Z M 885.195312 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 902.691406 375.386719 L 902.652344 376.015625 L 902.554688 376.585938 L 902.378906 377.117188 L 902.160156 377.585938 L 901.847656 378.019531 L 901.496094 378.410156 L 901.101562 378.746094 L 900.6875 379 L 900.238281 379.195312 L 899.746094 379.335938 L 899.234375 379.414062 L 898.6875 379.433594 L 894.191406 379.433594 L 894.191406 385.5 L 892.363281 385.5 L 892.363281 371.1875 L 898.273438 371.1875 L 899.117188 371.246094 L 899.882812 371.382812 L 900.550781 371.617188 L 901.140625 371.953125 L 901.632812 372.363281 L 902.042969 372.875 L 902.242188 373.246094 L 902.398438 373.621094 L 902.515625 374.011719 L 902.613281 374.445312 L 902.671875 374.917969 Z M 894.191406 377.824219 L 898 377.824219 L 898.53125 377.804688 L 899 377.703125 L 899.433594 377.566406 L 899.804688 377.351562 L 900.121094 377.078125 L 900.394531 376.742188 L 900.492188 376.546875 L 900.589844 376.3125 L 900.667969 376.09375 L 900.730469 375.839844 L 900.769531 375.585938 L 900.789062 375.308594 L 900.75 374.839844 L 900.648438 374.40625 L 900.492188 374.03125 L 900.277344 373.699219 L 899.984375 373.425781 L 899.648438 373.1875 L 899.414062 373.089844 L 899.15625 372.992188 L 898.882812 372.914062 L 898.609375 372.855469 L 898.3125 372.816406 L 898 372.796875 L 894.191406 372.796875 Z M 894.191406 377.824219 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 918.261719 385.5 L 916.261719 385.5 L 912.960938 373.738281 L 909.761719 385.5 L 907.757812 385.5 L 904.085938 371.1875 L 906.128906 371.1875 L 908.820312 382.808594 L 912 371.1875 L 913.960938 371.1875 L 917.222656 382.808594 L 919.851562 371.1875 L 921.894531 371.1875 Z M 918.261719 385.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(76.47059%,69.01961%,82.745099%);fill-opacity:1;" d="M 932.695312 378.429688 L 933.148438 378.6875 L 933.558594 378.960938 L 933.914062 379.277344 L 934.1875 379.648438 L 934.382812 380.042969 L 934.539062 380.472656 L 934.621094 380.964844 L 934.640625 381.257812 L 934.660156 381.59375 L 934.660156 382.378906 L 934.640625 382.789062 L 934.660156 383.144531 L 934.679688 383.457031 L 934.71875 383.734375 L 934.757812 383.96875 L 934.835938 384.164062 L 934.894531 384.359375 L 934.992188 384.519531 L 935.089844 384.675781 L 935.207031 384.8125 L 935.347656 384.949219 L 935.503906 385.046875 L 935.503906 385.5 L 933.285156 385.5 L 933.167969 385.1875 L 933.066406 384.851562 L 932.988281 384.460938 L 932.929688 384.066406 L 932.890625 383.632812 L 932.890625 381.886719 L 932.851562 381.316406 L 932.753906 380.808594 L 932.597656 380.375 L 932.359375 380.023438 L 932.066406 379.746094 L 931.714844 379.53125 L 931.535156 379.472656 L 931.359375 379.433594 L 931.164062 379.394531 L 930.96875 379.375 L 930.75 379.355469 L 930.535156 379.335938 L 925.824219 379.335938 L 925.824219 385.5 L 923.996094 385.5 L 923.996094 371.1875 L 930.59375 371.1875 L 931.476562 371.246094 L 932.28125 371.382812 L 932.96875 371.636719 L 933.558594 371.972656 L 934.050781 372.402344 L 934.441406 372.933594 L 934.578125 373.246094 L 934.71875 373.5625 L 934.816406 373.894531 L 934.894531 374.25 L 934.933594 374.621094 L 934.953125 375.015625 L 934.914062 375.542969 L 934.835938 376.035156 L 934.699219 376.488281 L 934.5 376.898438 L 934.265625 377.273438 L 933.972656 377.585938 L 933.792969 377.742188 L 933.597656 377.902344 L 933.402344 378.039062 L 933.1875 378.175781 L 932.949219 378.3125 Z M 933.046875 375.269531 L 932.988281 374.679688 L 932.871094 374.171875 L 932.636719 373.738281 L 932.339844 373.386719 L 931.929688 373.128906 L 931.457031 372.933594 L 931.28125 372.894531 L 931.085938 372.855469 L 930.886719 372.835938 L 930.671875 372.816406 L 930.457031 372.816406 L 930.242188 372.796875 L 925.824219 372.796875 L 925.824219 377.722656 L 930.242188 377.722656 L 930.886719 377.703125 L 931.457031 377.585938 L 931.929688 377.410156 L 932.320312 377.15625 L 932.636719 376.839844 L 932.851562 376.449219 L 932.910156 376.292969 L 932.949219 376.09375 L 932.988281 375.917969 L 933.007812 375.703125 L 933.027344 375.503906 Z M 933.046875 375.269531 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.47059%,69.01961%,82.745099%);stroke-opacity:1;stroke-miterlimit:10;" d="M 897 711 L 916 711 M 897 691 L 916 691 M 897 691 L 897 711 M 916 691 L 916 711 " 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 897 711 L 916 711 M 897 691 L 916 691 M 916 711 L 916 691 M 897 711 L 897 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 911.8125 472.804688 L 911.773438 472.253906 L 911.714844 471.78125 L 911.613281 471.351562 L 911.476562 470.957031 L 911.300781 470.625 L 911.085938 470.367188 L 910.769531 470.09375 L 910.417969 469.878906 L 909.984375 469.71875 L 909.476562 469.582031 L 908.90625 469.523438 L 908.296875 469.503906 L 902.957031 469.503906 L 902.957031 467.855469 L 913.246094 467.855469 L 913.246094 469.367188 L 911.378906 469.367188 L 911.851562 469.679688 L 912.28125 469.996094 L 912.636719 470.308594 L 912.929688 470.605469 L 913.167969 470.917969 L 913.34375 471.230469 L 913.402344 471.371094 L 913.480469 471.683594 L 913.519531 471.996094 L 913.539062 472.175781 L 913.519531 472.234375 L 913.519531 472.429688 L 913.480469 472.664062 L 913.480469 472.804688 Z M 911.8125 472.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 907.550781 483.09375 L 907.550781 475.511719 L 907.136719 475.511719 L 906.765625 475.550781 L 906.410156 475.609375 L 906.097656 475.6875 L 905.824219 475.789062 L 905.585938 475.90625 L 905.351562 476.0625 L 904.976562 476.316406 L 904.664062 476.613281 L 904.429688 476.964844 L 904.230469 477.339844 L 904.09375 477.75 L 904.035156 478.203125 L 904.015625 478.242188 L 904.015625 478.535156 L 904.054688 479.164062 L 904.230469 479.714844 L 904.527344 480.207031 L 904.917969 480.617188 L 905.429688 480.953125 L 906.078125 481.226562 L 906.078125 482.875 L 905.429688 482.699219 L 904.839844 482.484375 L 904.3125 482.1875 L 903.859375 481.835938 L 903.464844 481.402344 L 903.132812 480.933594 L 902.957031 480.558594 L 902.796875 480.1875 L 902.679688 479.792969 L 902.582031 479.359375 L 902.523438 478.929688 L 902.503906 478.476562 L 902.5625 477.730469 L 902.699219 477.0625 L 902.917969 476.457031 L 903.210938 475.90625 L 903.605469 475.394531 L 904.09375 474.960938 L 904.585938 474.609375 L 905.15625 474.316406 L 905.785156 474.078125 L 906.449219 473.921875 L 907.175781 473.824219 L 907.960938 473.804688 L 908.789062 473.824219 L 909.574219 473.941406 L 910.300781 474.136719 L 910.949219 474.394531 L 911.554688 474.726562 L 912.105469 475.160156 L 912.539062 475.589844 L 912.890625 476.082031 L 913.167969 476.632812 L 913.363281 477.203125 L 913.480469 477.828125 L 913.539062 478.515625 L 913.5 479.125 L 913.402344 479.695312 L 913.246094 480.226562 L 913.007812 480.734375 L 912.714844 481.207031 L 912.359375 481.660156 L 912.125 481.875 L 911.890625 482.070312 L 911.652344 482.246094 L 911.378906 482.40625 L 911.105469 482.542969 L 910.828125 482.679688 L 910.417969 482.796875 L 909.964844 482.894531 L 909.457031 482.972656 L 908.867188 483.03125 L 908.238281 483.070312 Z M 908.886719 475.550781 L 908.886719 481.324219 L 908.964844 481.324219 L 909.003906 481.34375 L 909.414062 481.304688 L 909.828125 481.246094 L 910.203125 481.109375 L 910.554688 480.953125 L 910.867188 480.734375 L 911.183594 480.480469 L 911.4375 480.1875 L 911.652344 479.890625 L 911.8125 479.558594 L 911.929688 479.222656 L 911.988281 478.871094 L 912.027344 478.496094 L 911.988281 478.027344 L 911.890625 477.59375 L 911.734375 477.203125 L 911.515625 476.847656 L 911.242188 476.515625 L 910.90625 476.238281 L 910.613281 476.042969 L 910.320312 475.886719 L 909.984375 475.769531 L 909.632812 475.648438 L 909.257812 475.589844 Z M 908.886719 475.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 906.019531 486.3125 L 905.664062 486.371094 L 905.351562 486.449219 L 905.078125 486.566406 L 904.820312 486.683594 L 904.625 486.863281 L 904.46875 487.058594 L 904.332031 487.273438 L 904.210938 487.53125 L 904.113281 487.804688 L 904.054688 488.117188 L 904.015625 488.453125 L 904.015625 488.824219 L 904.035156 489.257812 L 904.09375 489.667969 L 904.191406 490.042969 L 904.332031 490.355469 L 904.507812 490.632812 L 904.722656 490.867188 L 904.839844 490.964844 L 904.976562 491.0625 L 905.136719 491.121094 L 905.292969 491.179688 L 905.449219 491.203125 L 905.625 491.222656 L 905.863281 491.179688 L 906.078125 491.121094 L 906.273438 491.023438 L 906.449219 490.867188 L 906.609375 490.671875 L 906.765625 490.457031 L 906.804688 490.335938 L 906.863281 490.21875 L 906.921875 490.082031 L 906.960938 489.945312 L 907 489.789062 L 907.058594 489.628906 L 907.433594 488.097656 L 907.589844 487.449219 L 907.785156 486.882812 L 907.984375 486.390625 L 908.199219 485.957031 L 908.433594 485.625 L 908.707031 485.371094 L 908.925781 485.191406 L 909.160156 485.074219 L 909.433594 484.957031 L 909.730469 484.898438 L 910.042969 484.839844 L 910.398438 484.839844 L 910.886719 484.859375 L 911.339844 484.957031 L 911.773438 485.132812 L 912.144531 485.371094 L 912.480469 485.683594 L 912.792969 486.058594 L 913.007812 486.429688 L 913.1875 486.84375 L 913.34375 487.273438 L 913.441406 487.746094 L 913.5 488.234375 L 913.539062 488.785156 L 913.480469 489.53125 L 913.363281 490.21875 L 913.167969 490.808594 L 912.871094 491.320312 L 912.5 491.730469 L 912.066406 492.085938 L 911.8125 492.203125 L 911.554688 492.320312 L 911.28125 492.398438 L 910.988281 492.457031 L 910.691406 492.496094 L 910.378906 492.515625 L 910.378906 490.789062 L 910.808594 490.730469 L 911.183594 490.59375 L 911.496094 490.355469 L 911.714844 490.042969 L 911.890625 489.648438 L 911.988281 489.179688 L 911.988281 489.023438 L 912.007812 488.941406 L 912.007812 488.785156 L 912.027344 488.726562 L 911.988281 488.277344 L 911.929688 487.882812 L 911.832031 487.550781 L 911.675781 487.253906 L 911.496094 487 L 911.28125 486.804688 L 911.144531 486.703125 L 911.027344 486.644531 L 910.886719 486.605469 L 910.75 486.566406 L 910.613281 486.546875 L 910.476562 486.546875 L 910.222656 486.566406 L 910.003906 486.644531 L 909.789062 486.785156 L 909.613281 486.960938 L 909.433594 487.195312 L 909.296875 487.511719 L 909.238281 487.628906 L 909.199219 487.785156 L 909.140625 487.921875 L 909.101562 488.097656 L 909.042969 488.257812 L 909.003906 488.453125 L 908.628906 490.023438 L 908.453125 490.652344 L 908.238281 491.203125 L 908.003906 491.671875 L 907.726562 492.066406 L 907.433594 492.378906 L 907.097656 492.613281 L 906.902344 492.714844 L 906.6875 492.792969 L 906.488281 492.851562 L 906.253906 492.890625 L 906.019531 492.910156 L 905.765625 492.929688 L 905.253906 492.890625 L 904.78125 492.773438 L 904.351562 492.59375 L 903.957031 492.339844 L 903.605469 492.027344 L 903.289062 491.632812 L 903.035156 491.222656 L 902.859375 490.789062 L 902.699219 490.316406 L 902.601562 489.808594 L 902.542969 489.257812 L 902.503906 488.6875 L 902.582031 487.648438 L 902.777344 486.765625 L 903.09375 486.039062 L 903.566406 485.449219 L 904.171875 485.015625 L 904.917969 484.742188 L 905.078125 484.683594 L 905.253906 484.644531 L 905.605469 484.605469 L 905.804688 484.585938 L 906.019531 484.585938 Z M 906.019531 486.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 917.269531 496.679688 L 915.207031 496.679688 L 915.207031 495.03125 L 917.269531 495.03125 Z M 913.246094 496.679688 L 902.957031 496.679688 L 902.957031 495.050781 L 913.246094 495.050781 Z M 913.246094 496.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 906.019531 500.46875 L 905.664062 500.527344 L 905.351562 500.605469 L 905.078125 500.722656 L 904.820312 500.84375 L 904.625 501.019531 L 904.46875 501.214844 L 904.332031 501.429688 L 904.210938 501.6875 L 904.113281 501.960938 L 904.054688 502.277344 L 904.015625 502.609375 L 904.015625 502.984375 L 904.035156 503.414062 L 904.09375 503.828125 L 904.191406 504.199219 L 904.332031 504.515625 L 904.507812 504.789062 L 904.722656 505.023438 L 904.839844 505.121094 L 904.976562 505.222656 L 905.136719 505.28125 L 905.292969 505.339844 L 905.449219 505.359375 L 905.625 505.378906 L 905.863281 505.339844 L 906.078125 505.28125 L 906.273438 505.179688 L 906.449219 505.023438 L 906.609375 504.828125 L 906.765625 504.613281 L 906.804688 504.496094 L 906.863281 504.375 L 906.921875 504.238281 L 906.960938 504.101562 L 907 503.945312 L 907.058594 503.789062 L 907.433594 502.257812 L 907.589844 501.609375 L 907.785156 501.039062 L 907.984375 500.546875 L 908.199219 500.117188 L 908.433594 499.78125 L 908.707031 499.527344 L 908.925781 499.351562 L 909.160156 499.230469 L 909.433594 499.113281 L 909.730469 499.054688 L 910.042969 498.996094 L 910.398438 498.996094 L 910.886719 499.015625 L 911.339844 499.113281 L 911.773438 499.292969 L 912.144531 499.527344 L 912.480469 499.839844 L 912.792969 500.214844 L 913.007812 500.585938 L 913.1875 501 L 913.34375 501.429688 L 913.441406 501.902344 L 913.5 502.394531 L 913.539062 502.941406 L 913.480469 503.6875 L 913.363281 504.375 L 913.167969 504.964844 L 912.871094 505.476562 L 912.5 505.886719 L 912.066406 506.242188 L 911.8125 506.359375 L 911.554688 506.476562 L 911.28125 506.554688 L 910.988281 506.613281 L 910.691406 506.652344 L 910.378906 506.675781 L 910.378906 504.945312 L 910.808594 504.886719 L 911.183594 504.75 L 911.496094 504.515625 L 911.714844 504.199219 L 911.890625 503.808594 L 911.988281 503.335938 L 911.988281 503.179688 L 912.007812 503.101562 L 912.007812 502.941406 L 912.027344 502.882812 L 911.988281 502.433594 L 911.929688 502.039062 L 911.832031 501.707031 L 911.675781 501.410156 L 911.496094 501.15625 L 911.28125 500.960938 L 911.144531 500.863281 L 911.027344 500.804688 L 910.886719 500.765625 L 910.75 500.722656 L 910.613281 500.703125 L 910.476562 500.703125 L 910.222656 500.722656 L 910.003906 500.804688 L 909.789062 500.941406 L 909.613281 501.117188 L 909.433594 501.351562 L 909.296875 501.667969 L 909.238281 501.785156 L 909.199219 501.941406 L 909.140625 502.078125 L 909.101562 502.257812 L 909.042969 502.414062 L 909.003906 502.609375 L 908.628906 504.179688 L 908.453125 504.808594 L 908.238281 505.359375 L 908.003906 505.828125 L 907.726562 506.222656 L 907.433594 506.535156 L 907.097656 506.773438 L 906.902344 506.871094 L 906.6875 506.949219 L 906.488281 507.007812 L 906.253906 507.046875 L 906.019531 507.066406 L 905.765625 507.085938 L 905.253906 507.046875 L 904.78125 506.929688 L 904.351562 506.753906 L 903.957031 506.496094 L 903.605469 506.183594 L 903.289062 505.789062 L 903.035156 505.378906 L 902.859375 504.945312 L 902.699219 504.476562 L 902.601562 503.964844 L 902.542969 503.414062 L 902.503906 502.84375 L 902.582031 501.804688 L 902.777344 500.921875 L 903.09375 500.195312 L 903.566406 499.605469 L 904.171875 499.171875 L 904.917969 498.898438 L 905.078125 498.839844 L 905.253906 498.800781 L 905.605469 498.761719 L 905.804688 498.742188 L 906.019531 498.742188 Z M 906.019531 500.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 913.246094 512.878906 L 911.910156 512.878906 L 911.910156 511.191406 L 904.644531 511.191406 L 904.46875 511.210938 L 904.3125 511.25 L 904.191406 511.308594 L 904.09375 511.386719 L 904.035156 511.484375 L 903.996094 511.542969 L 903.976562 511.640625 L 903.957031 511.71875 L 903.9375 511.839844 L 903.9375 512.542969 L 903.957031 512.664062 L 903.976562 512.78125 L 904.015625 512.878906 L 902.640625 512.878906 L 902.601562 512.625 L 902.5625 512.386719 L 902.542969 512.152344 L 902.523438 511.9375 L 902.523438 511.71875 L 902.503906 511.542969 L 902.542969 511.070312 L 902.621094 510.660156 L 902.757812 510.304688 L 902.957031 510.03125 L 903.191406 509.816406 L 903.503906 509.660156 L 903.585938 509.621094 L 903.683594 509.597656 L 903.78125 509.578125 L 903.898438 509.558594 L 911.910156 509.558594 L 911.910156 508.167969 L 913.246094 508.167969 L 913.246094 509.558594 L 916.070312 509.558594 L 916.070312 511.191406 L 913.246094 511.191406 Z M 913.246094 512.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 917.269531 516.277344 L 915.207031 516.277344 L 915.207031 514.625 L 917.269531 514.625 Z M 913.246094 516.277344 L 902.957031 516.277344 L 902.957031 514.644531 L 913.246094 514.644531 Z M 913.246094 516.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 902.957031 523.265625 L 902.957031 521.480469 L 913.246094 517.867188 L 913.246094 519.710938 L 904.898438 522.460938 L 913.246094 525.367188 L 913.246094 527.210938 Z M 902.957031 523.265625 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 907.550781 537.558594 L 907.550781 529.980469 L 907.136719 529.980469 L 906.765625 530.019531 L 906.410156 530.078125 L 906.097656 530.15625 L 905.824219 530.257812 L 905.585938 530.375 L 905.351562 530.53125 L 904.976562 530.785156 L 904.664062 531.082031 L 904.429688 531.433594 L 904.230469 531.808594 L 904.09375 532.21875 L 904.035156 532.671875 L 904.015625 532.710938 L 904.015625 533.003906 L 904.054688 533.632812 L 904.230469 534.183594 L 904.527344 534.675781 L 904.917969 535.085938 L 905.429688 535.421875 L 906.078125 535.695312 L 906.078125 537.34375 L 905.429688 537.167969 L 904.839844 536.953125 L 904.3125 536.65625 L 903.859375 536.304688 L 903.464844 535.871094 L 903.132812 535.402344 L 902.957031 535.027344 L 902.796875 534.652344 L 902.679688 534.261719 L 902.582031 533.828125 L 902.523438 533.398438 L 902.503906 532.945312 L 902.5625 532.199219 L 902.699219 531.53125 L 902.917969 530.921875 L 903.210938 530.375 L 903.605469 529.863281 L 904.09375 529.429688 L 904.585938 529.078125 L 905.15625 528.785156 L 905.785156 528.546875 L 906.449219 528.390625 L 907.175781 528.292969 L 907.960938 528.273438 L 908.789062 528.292969 L 909.574219 528.410156 L 910.300781 528.605469 L 910.949219 528.863281 L 911.554688 529.195312 L 912.105469 529.628906 L 912.539062 530.058594 L 912.890625 530.550781 L 913.167969 531.101562 L 913.363281 531.667969 L 913.480469 532.296875 L 913.539062 532.984375 L 913.5 533.59375 L 913.402344 534.164062 L 913.246094 534.695312 L 913.007812 535.203125 L 912.714844 535.675781 L 912.359375 536.125 L 912.125 536.34375 L 911.890625 536.539062 L 911.652344 536.714844 L 911.378906 536.875 L 911.105469 537.011719 L 910.828125 537.148438 L 910.417969 537.265625 L 909.964844 537.363281 L 909.457031 537.441406 L 908.867188 537.5 L 908.238281 537.539062 Z M 908.886719 530.019531 L 908.886719 535.792969 L 908.964844 535.792969 L 909.003906 535.8125 L 909.414062 535.773438 L 909.828125 535.714844 L 910.203125 535.578125 L 910.554688 535.421875 L 910.867188 535.203125 L 911.183594 534.949219 L 911.4375 534.652344 L 911.652344 534.359375 L 911.8125 534.027344 L 911.929688 533.691406 L 911.988281 533.339844 L 912.027344 532.964844 L 911.988281 532.496094 L 911.890625 532.0625 L 911.734375 531.667969 L 911.515625 531.316406 L 911.242188 530.984375 L 910.90625 530.707031 L 910.613281 530.511719 L 910.320312 530.355469 L 909.984375 530.234375 L 909.632812 530.117188 L 909.257812 530.058594 Z M 908.886719 530.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 900.480469 549.734375 L 899.5 549.734375 L 899.5 537.953125 L 900.480469 537.953125 Z M 900.480469 549.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 917.269531 552.265625 L 902.957031 552.265625 L 902.957031 550.617188 L 917.269531 550.617188 Z M 917.269531 552.265625 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 917.269531 556.566406 L 915.207031 556.566406 L 915.207031 554.917969 L 917.269531 554.917969 Z M 913.246094 556.566406 L 902.957031 556.566406 L 902.957031 554.9375 L 913.246094 554.9375 Z M 913.246094 556.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 912.871094 563.046875 L 912.871094 559.964844 L 914.109375 559.964844 L 914.167969 560.496094 L 914.246094 560.964844 L 914.34375 561.378906 L 914.421875 561.730469 L 914.519531 562.027344 L 914.640625 562.28125 L 914.757812 562.476562 L 914.894531 562.652344 L 915.050781 562.8125 L 915.246094 562.96875 L 915.464844 563.105469 L 915.71875 563.242188 L 915.855469 563.300781 L 916.011719 563.359375 L 916.191406 563.421875 L 916.40625 563.5 L 916.621094 563.558594 L 916.878906 563.636719 L 916.878906 564.773438 L 902.957031 564.773438 L 902.957031 563.046875 Z M 912.871094 563.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 900.480469 580.207031 L 899.5 580.207031 L 899.5 568.425781 L 900.480469 568.425781 Z M 900.480469 580.207031 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 913.539062 585.097656 L 913.480469 585.902344 L 913.324219 586.628906 L 913.066406 587.296875 L 912.695312 587.886719 L 912.222656 588.394531 L 911.675781 588.847656 L 911.164062 589.121094 L 910.613281 589.339844 L 910.003906 589.535156 L 909.375 589.652344 L 908.667969 589.730469 L 907.941406 589.769531 L 907.039062 589.710938 L 906.214844 589.59375 L 905.46875 589.398438 L 904.800781 589.101562 L 904.210938 588.730469 L 903.703125 588.296875 L 903.328125 587.867188 L 903.015625 587.394531 L 902.820312 586.882812 L 902.640625 586.335938 L 902.542969 585.746094 L 902.503906 585.117188 L 902.5625 584.351562 L 902.699219 583.644531 L 902.9375 582.996094 L 903.25 582.425781 L 903.683594 581.917969 L 904.230469 581.484375 L 904.722656 581.152344 L 905.292969 580.894531 L 905.882812 580.699219 L 906.550781 580.5625 L 907.257812 580.484375 L 908.023438 580.464844 L 908.945312 580.503906 L 909.789062 580.621094 L 910.554688 580.835938 L 911.242188 581.132812 L 911.851562 581.523438 L 912.378906 581.996094 L 912.714844 582.40625 L 913.007812 582.859375 L 913.246094 583.371094 L 913.402344 583.898438 L 913.5 584.46875 Z M 912.027344 585.117188 L 911.988281 584.625 L 911.871094 584.175781 L 911.695312 583.761719 L 911.4375 583.410156 L 911.105469 583.074219 L 910.710938 582.800781 L 910.339844 582.605469 L 909.925781 582.445312 L 909.496094 582.328125 L 909.023438 582.230469 L 908.53125 582.171875 L 908.023438 582.171875 L 907.296875 582.191406 L 906.628906 582.289062 L 906.039062 582.445312 L 905.507812 582.664062 L 905.058594 582.957031 L 904.683594 583.3125 L 904.46875 583.546875 L 904.292969 583.820312 L 904.171875 584.117188 L 904.074219 584.429688 L 904.015625 584.765625 L 904.015625 585.117188 L 904.035156 585.589844 L 904.152344 586.039062 L 904.332031 586.433594 L 904.585938 586.804688 L 904.898438 587.121094 L 905.3125 587.414062 L 905.664062 587.609375 L 906.058594 587.769531 L 906.488281 587.886719 L 906.941406 587.984375 L 907.433594 588.042969 L 907.960938 588.0625 L 908.730469 588.023438 L 909.414062 587.925781 L 910.023438 587.75 L 910.574219 587.511719 L 911.027344 587.199219 L 911.417969 586.84375 L 911.59375 586.589844 L 911.753906 586.335938 L 911.871094 586.058594 L 911.949219 585.765625 L 912.007812 585.449219 Z M 912.027344 585.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 917.269531 593.421875 L 908.886719 593.421875 L 913.246094 597.78125 L 913.246094 599.882812 L 909.691406 596.308594 L 902.957031 600.511719 L 902.957031 598.488281 L 908.53125 595.011719 L 906.960938 593.421875 L 902.957031 593.421875 L 902.957031 591.792969 L 917.269531 591.792969 Z M 917.269531 593.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1018.8125 472.804688 L 1018.773438 472.253906 L 1018.714844 471.78125 L 1018.613281 471.351562 L 1018.476562 470.957031 L 1018.300781 470.625 L 1018.085938 470.367188 L 1017.769531 470.09375 L 1017.417969 469.878906 L 1016.984375 469.71875 L 1016.476562 469.582031 L 1015.90625 469.523438 L 1015.296875 469.503906 L 1009.957031 469.503906 L 1009.957031 467.855469 L 1020.246094 467.855469 L 1020.246094 469.367188 L 1018.378906 469.367188 L 1018.851562 469.679688 L 1019.28125 469.996094 L 1019.636719 470.308594 L 1019.929688 470.605469 L 1020.167969 470.917969 L 1020.34375 471.230469 L 1020.402344 471.371094 L 1020.480469 471.683594 L 1020.519531 471.996094 L 1020.539062 472.175781 L 1020.519531 472.234375 L 1020.519531 472.429688 L 1020.480469 472.664062 L 1020.480469 472.804688 Z M 1018.8125 472.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1014.550781 483.09375 L 1014.550781 475.511719 L 1014.136719 475.511719 L 1013.765625 475.550781 L 1013.410156 475.609375 L 1013.097656 475.6875 L 1012.824219 475.789062 L 1012.585938 475.90625 L 1012.351562 476.0625 L 1011.976562 476.316406 L 1011.664062 476.613281 L 1011.429688 476.964844 L 1011.230469 477.339844 L 1011.09375 477.75 L 1011.035156 478.203125 L 1011.015625 478.242188 L 1011.015625 478.535156 L 1011.054688 479.164062 L 1011.230469 479.714844 L 1011.527344 480.207031 L 1011.917969 480.617188 L 1012.429688 480.953125 L 1013.078125 481.226562 L 1013.078125 482.875 L 1012.429688 482.699219 L 1011.839844 482.484375 L 1011.3125 482.1875 L 1010.859375 481.835938 L 1010.464844 481.402344 L 1010.132812 480.933594 L 1009.957031 480.558594 L 1009.796875 480.1875 L 1009.679688 479.792969 L 1009.582031 479.359375 L 1009.523438 478.929688 L 1009.503906 478.476562 L 1009.5625 477.730469 L 1009.699219 477.0625 L 1009.917969 476.457031 L 1010.210938 475.90625 L 1010.605469 475.394531 L 1011.09375 474.960938 L 1011.585938 474.609375 L 1012.15625 474.316406 L 1012.785156 474.078125 L 1013.449219 473.921875 L 1014.175781 473.824219 L 1014.960938 473.804688 L 1015.789062 473.824219 L 1016.574219 473.941406 L 1017.300781 474.136719 L 1017.949219 474.394531 L 1018.554688 474.726562 L 1019.105469 475.160156 L 1019.539062 475.589844 L 1019.890625 476.082031 L 1020.167969 476.632812 L 1020.363281 477.203125 L 1020.480469 477.828125 L 1020.539062 478.515625 L 1020.5 479.125 L 1020.402344 479.695312 L 1020.246094 480.226562 L 1020.007812 480.734375 L 1019.714844 481.207031 L 1019.359375 481.660156 L 1019.125 481.875 L 1018.890625 482.070312 L 1018.652344 482.246094 L 1018.378906 482.40625 L 1018.105469 482.542969 L 1017.828125 482.679688 L 1017.417969 482.796875 L 1016.964844 482.894531 L 1016.457031 482.972656 L 1015.867188 483.03125 L 1015.238281 483.070312 Z M 1015.886719 475.550781 L 1015.886719 481.324219 L 1015.964844 481.324219 L 1016.003906 481.34375 L 1016.414062 481.304688 L 1016.828125 481.246094 L 1017.203125 481.109375 L 1017.554688 480.953125 L 1017.867188 480.734375 L 1018.183594 480.480469 L 1018.4375 480.1875 L 1018.652344 479.890625 L 1018.8125 479.558594 L 1018.929688 479.222656 L 1018.988281 478.871094 L 1019.027344 478.496094 L 1018.988281 478.027344 L 1018.890625 477.59375 L 1018.734375 477.203125 L 1018.515625 476.847656 L 1018.242188 476.515625 L 1017.90625 476.238281 L 1017.613281 476.042969 L 1017.320312 475.886719 L 1016.984375 475.769531 L 1016.632812 475.648438 L 1016.257812 475.589844 Z M 1015.886719 475.550781 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1013.019531 486.3125 L 1012.664062 486.371094 L 1012.351562 486.449219 L 1012.078125 486.566406 L 1011.820312 486.683594 L 1011.625 486.863281 L 1011.46875 487.058594 L 1011.332031 487.273438 L 1011.210938 487.53125 L 1011.113281 487.804688 L 1011.054688 488.117188 L 1011.015625 488.453125 L 1011.015625 488.824219 L 1011.035156 489.257812 L 1011.09375 489.667969 L 1011.191406 490.042969 L 1011.332031 490.355469 L 1011.507812 490.632812 L 1011.722656 490.867188 L 1011.839844 490.964844 L 1011.976562 491.0625 L 1012.136719 491.121094 L 1012.292969 491.179688 L 1012.449219 491.203125 L 1012.625 491.222656 L 1012.863281 491.179688 L 1013.078125 491.121094 L 1013.273438 491.023438 L 1013.449219 490.867188 L 1013.609375 490.671875 L 1013.765625 490.457031 L 1013.804688 490.335938 L 1013.863281 490.21875 L 1013.921875 490.082031 L 1013.960938 489.945312 L 1014 489.789062 L 1014.058594 489.628906 L 1014.433594 488.097656 L 1014.589844 487.449219 L 1014.785156 486.882812 L 1014.984375 486.390625 L 1015.199219 485.957031 L 1015.433594 485.625 L 1015.707031 485.371094 L 1015.925781 485.191406 L 1016.160156 485.074219 L 1016.433594 484.957031 L 1016.730469 484.898438 L 1017.042969 484.839844 L 1017.398438 484.839844 L 1017.886719 484.859375 L 1018.339844 484.957031 L 1018.773438 485.132812 L 1019.144531 485.371094 L 1019.480469 485.683594 L 1019.792969 486.058594 L 1020.007812 486.429688 L 1020.1875 486.84375 L 1020.34375 487.273438 L 1020.441406 487.746094 L 1020.5 488.234375 L 1020.539062 488.785156 L 1020.480469 489.53125 L 1020.363281 490.21875 L 1020.167969 490.808594 L 1019.871094 491.320312 L 1019.5 491.730469 L 1019.066406 492.085938 L 1018.8125 492.203125 L 1018.554688 492.320312 L 1018.28125 492.398438 L 1017.988281 492.457031 L 1017.691406 492.496094 L 1017.378906 492.515625 L 1017.378906 490.789062 L 1017.808594 490.730469 L 1018.183594 490.59375 L 1018.496094 490.355469 L 1018.714844 490.042969 L 1018.890625 489.648438 L 1018.988281 489.179688 L 1018.988281 489.023438 L 1019.007812 488.941406 L 1019.007812 488.785156 L 1019.027344 488.726562 L 1018.988281 488.277344 L 1018.929688 487.882812 L 1018.832031 487.550781 L 1018.675781 487.253906 L 1018.496094 487 L 1018.28125 486.804688 L 1018.144531 486.703125 L 1018.027344 486.644531 L 1017.886719 486.605469 L 1017.75 486.566406 L 1017.613281 486.546875 L 1017.476562 486.546875 L 1017.222656 486.566406 L 1017.003906 486.644531 L 1016.789062 486.785156 L 1016.613281 486.960938 L 1016.433594 487.195312 L 1016.296875 487.511719 L 1016.238281 487.628906 L 1016.199219 487.785156 L 1016.140625 487.921875 L 1016.101562 488.097656 L 1016.042969 488.257812 L 1016.003906 488.453125 L 1015.628906 490.023438 L 1015.453125 490.652344 L 1015.238281 491.203125 L 1015.003906 491.671875 L 1014.726562 492.066406 L 1014.433594 492.378906 L 1014.097656 492.613281 L 1013.902344 492.714844 L 1013.6875 492.792969 L 1013.488281 492.851562 L 1013.253906 492.890625 L 1013.019531 492.910156 L 1012.765625 492.929688 L 1012.253906 492.890625 L 1011.78125 492.773438 L 1011.351562 492.59375 L 1010.957031 492.339844 L 1010.605469 492.027344 L 1010.289062 491.632812 L 1010.035156 491.222656 L 1009.859375 490.789062 L 1009.699219 490.316406 L 1009.601562 489.808594 L 1009.542969 489.257812 L 1009.503906 488.6875 L 1009.582031 487.648438 L 1009.777344 486.765625 L 1010.09375 486.039062 L 1010.566406 485.449219 L 1011.171875 485.015625 L 1011.917969 484.742188 L 1012.078125 484.683594 L 1012.253906 484.644531 L 1012.605469 484.605469 L 1012.804688 484.585938 L 1013.019531 484.585938 Z M 1013.019531 486.3125 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1024.269531 496.679688 L 1022.207031 496.679688 L 1022.207031 495.03125 L 1024.269531 495.03125 Z M 1020.246094 496.679688 L 1009.957031 496.679688 L 1009.957031 495.050781 L 1020.246094 495.050781 Z M 1020.246094 496.679688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1013.019531 500.46875 L 1012.664062 500.527344 L 1012.351562 500.605469 L 1012.078125 500.722656 L 1011.820312 500.84375 L 1011.625 501.019531 L 1011.46875 501.214844 L 1011.332031 501.429688 L 1011.210938 501.6875 L 1011.113281 501.960938 L 1011.054688 502.277344 L 1011.015625 502.609375 L 1011.015625 502.984375 L 1011.035156 503.414062 L 1011.09375 503.828125 L 1011.191406 504.199219 L 1011.332031 504.515625 L 1011.507812 504.789062 L 1011.722656 505.023438 L 1011.839844 505.121094 L 1011.976562 505.222656 L 1012.136719 505.28125 L 1012.292969 505.339844 L 1012.449219 505.359375 L 1012.625 505.378906 L 1012.863281 505.339844 L 1013.078125 505.28125 L 1013.273438 505.179688 L 1013.449219 505.023438 L 1013.609375 504.828125 L 1013.765625 504.613281 L 1013.804688 504.496094 L 1013.863281 504.375 L 1013.921875 504.238281 L 1013.960938 504.101562 L 1014 503.945312 L 1014.058594 503.789062 L 1014.433594 502.257812 L 1014.589844 501.609375 L 1014.785156 501.039062 L 1014.984375 500.546875 L 1015.199219 500.117188 L 1015.433594 499.78125 L 1015.707031 499.527344 L 1015.925781 499.351562 L 1016.160156 499.230469 L 1016.433594 499.113281 L 1016.730469 499.054688 L 1017.042969 498.996094 L 1017.398438 498.996094 L 1017.886719 499.015625 L 1018.339844 499.113281 L 1018.773438 499.292969 L 1019.144531 499.527344 L 1019.480469 499.839844 L 1019.792969 500.214844 L 1020.007812 500.585938 L 1020.1875 501 L 1020.34375 501.429688 L 1020.441406 501.902344 L 1020.5 502.394531 L 1020.539062 502.941406 L 1020.480469 503.6875 L 1020.363281 504.375 L 1020.167969 504.964844 L 1019.871094 505.476562 L 1019.5 505.886719 L 1019.066406 506.242188 L 1018.8125 506.359375 L 1018.554688 506.476562 L 1018.28125 506.554688 L 1017.988281 506.613281 L 1017.691406 506.652344 L 1017.378906 506.675781 L 1017.378906 504.945312 L 1017.808594 504.886719 L 1018.183594 504.75 L 1018.496094 504.515625 L 1018.714844 504.199219 L 1018.890625 503.808594 L 1018.988281 503.335938 L 1018.988281 503.179688 L 1019.007812 503.101562 L 1019.007812 502.941406 L 1019.027344 502.882812 L 1018.988281 502.433594 L 1018.929688 502.039062 L 1018.832031 501.707031 L 1018.675781 501.410156 L 1018.496094 501.15625 L 1018.28125 500.960938 L 1018.144531 500.863281 L 1018.027344 500.804688 L 1017.886719 500.765625 L 1017.75 500.722656 L 1017.613281 500.703125 L 1017.476562 500.703125 L 1017.222656 500.722656 L 1017.003906 500.804688 L 1016.789062 500.941406 L 1016.613281 501.117188 L 1016.433594 501.351562 L 1016.296875 501.667969 L 1016.238281 501.785156 L 1016.199219 501.941406 L 1016.140625 502.078125 L 1016.101562 502.257812 L 1016.042969 502.414062 L 1016.003906 502.609375 L 1015.628906 504.179688 L 1015.453125 504.808594 L 1015.238281 505.359375 L 1015.003906 505.828125 L 1014.726562 506.222656 L 1014.433594 506.535156 L 1014.097656 506.773438 L 1013.902344 506.871094 L 1013.6875 506.949219 L 1013.488281 507.007812 L 1013.253906 507.046875 L 1013.019531 507.066406 L 1012.765625 507.085938 L 1012.253906 507.046875 L 1011.78125 506.929688 L 1011.351562 506.753906 L 1010.957031 506.496094 L 1010.605469 506.183594 L 1010.289062 505.789062 L 1010.035156 505.378906 L 1009.859375 504.945312 L 1009.699219 504.476562 L 1009.601562 503.964844 L 1009.542969 503.414062 L 1009.503906 502.84375 L 1009.582031 501.804688 L 1009.777344 500.921875 L 1010.09375 500.195312 L 1010.566406 499.605469 L 1011.171875 499.171875 L 1011.917969 498.898438 L 1012.078125 498.839844 L 1012.253906 498.800781 L 1012.605469 498.761719 L 1012.804688 498.742188 L 1013.019531 498.742188 Z M 1013.019531 500.46875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1020.246094 512.878906 L 1018.910156 512.878906 L 1018.910156 511.191406 L 1011.644531 511.191406 L 1011.46875 511.210938 L 1011.3125 511.25 L 1011.191406 511.308594 L 1011.09375 511.386719 L 1011.035156 511.484375 L 1010.996094 511.542969 L 1010.976562 511.640625 L 1010.957031 511.71875 L 1010.9375 511.839844 L 1010.9375 512.542969 L 1010.957031 512.664062 L 1010.976562 512.78125 L 1011.015625 512.878906 L 1009.640625 512.878906 L 1009.601562 512.625 L 1009.5625 512.386719 L 1009.542969 512.152344 L 1009.523438 511.9375 L 1009.523438 511.71875 L 1009.503906 511.542969 L 1009.542969 511.070312 L 1009.621094 510.660156 L 1009.757812 510.304688 L 1009.957031 510.03125 L 1010.191406 509.816406 L 1010.503906 509.660156 L 1010.585938 509.621094 L 1010.683594 509.597656 L 1010.78125 509.578125 L 1010.898438 509.558594 L 1018.910156 509.558594 L 1018.910156 508.167969 L 1020.246094 508.167969 L 1020.246094 509.558594 L 1023.070312 509.558594 L 1023.070312 511.191406 L 1020.246094 511.191406 Z M 1020.246094 512.878906 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1024.269531 516.277344 L 1022.207031 516.277344 L 1022.207031 514.625 L 1024.269531 514.625 Z M 1020.246094 516.277344 L 1009.957031 516.277344 L 1009.957031 514.644531 L 1020.246094 514.644531 Z M 1020.246094 516.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1009.957031 523.265625 L 1009.957031 521.480469 L 1020.246094 517.867188 L 1020.246094 519.710938 L 1011.898438 522.460938 L 1020.246094 525.367188 L 1020.246094 527.210938 Z M 1009.957031 523.265625 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1014.550781 537.558594 L 1014.550781 529.980469 L 1014.136719 529.980469 L 1013.765625 530.019531 L 1013.410156 530.078125 L 1013.097656 530.15625 L 1012.824219 530.257812 L 1012.585938 530.375 L 1012.351562 530.53125 L 1011.976562 530.785156 L 1011.664062 531.082031 L 1011.429688 531.433594 L 1011.230469 531.808594 L 1011.09375 532.21875 L 1011.035156 532.671875 L 1011.015625 532.710938 L 1011.015625 533.003906 L 1011.054688 533.632812 L 1011.230469 534.183594 L 1011.527344 534.675781 L 1011.917969 535.085938 L 1012.429688 535.421875 L 1013.078125 535.695312 L 1013.078125 537.34375 L 1012.429688 537.167969 L 1011.839844 536.953125 L 1011.3125 536.65625 L 1010.859375 536.304688 L 1010.464844 535.871094 L 1010.132812 535.402344 L 1009.957031 535.027344 L 1009.796875 534.652344 L 1009.679688 534.261719 L 1009.582031 533.828125 L 1009.523438 533.398438 L 1009.503906 532.945312 L 1009.5625 532.199219 L 1009.699219 531.53125 L 1009.917969 530.921875 L 1010.210938 530.375 L 1010.605469 529.863281 L 1011.09375 529.429688 L 1011.585938 529.078125 L 1012.15625 528.785156 L 1012.785156 528.546875 L 1013.449219 528.390625 L 1014.175781 528.292969 L 1014.960938 528.273438 L 1015.789062 528.292969 L 1016.574219 528.410156 L 1017.300781 528.605469 L 1017.949219 528.863281 L 1018.554688 529.195312 L 1019.105469 529.628906 L 1019.539062 530.058594 L 1019.890625 530.550781 L 1020.167969 531.101562 L 1020.363281 531.667969 L 1020.480469 532.296875 L 1020.539062 532.984375 L 1020.5 533.59375 L 1020.402344 534.164062 L 1020.246094 534.695312 L 1020.007812 535.203125 L 1019.714844 535.675781 L 1019.359375 536.125 L 1019.125 536.34375 L 1018.890625 536.539062 L 1018.652344 536.714844 L 1018.378906 536.875 L 1018.105469 537.011719 L 1017.828125 537.148438 L 1017.417969 537.265625 L 1016.964844 537.363281 L 1016.457031 537.441406 L 1015.867188 537.5 L 1015.238281 537.539062 Z M 1015.886719 530.019531 L 1015.886719 535.792969 L 1015.964844 535.792969 L 1016.003906 535.8125 L 1016.414062 535.773438 L 1016.828125 535.714844 L 1017.203125 535.578125 L 1017.554688 535.421875 L 1017.867188 535.203125 L 1018.183594 534.949219 L 1018.4375 534.652344 L 1018.652344 534.359375 L 1018.8125 534.027344 L 1018.929688 533.691406 L 1018.988281 533.339844 L 1019.027344 532.964844 L 1018.988281 532.496094 L 1018.890625 532.0625 L 1018.734375 531.667969 L 1018.515625 531.316406 L 1018.242188 530.984375 L 1017.90625 530.707031 L 1017.613281 530.511719 L 1017.320312 530.355469 L 1016.984375 530.234375 L 1016.632812 530.117188 L 1016.257812 530.058594 Z M 1015.886719 530.019531 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1007.480469 549.734375 L 1006.5 549.734375 L 1006.5 537.953125 L 1007.480469 537.953125 Z M 1007.480469 549.734375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1024.269531 552.265625 L 1009.957031 552.265625 L 1009.957031 550.617188 L 1024.269531 550.617188 Z M 1024.269531 552.265625 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1024.269531 556.566406 L 1022.207031 556.566406 L 1022.207031 554.917969 L 1024.269531 554.917969 Z M 1020.246094 556.566406 L 1009.957031 556.566406 L 1009.957031 554.9375 L 1020.246094 554.9375 Z M 1020.246094 556.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1019.871094 563.046875 L 1019.871094 559.964844 L 1021.109375 559.964844 L 1021.167969 560.496094 L 1021.246094 560.964844 L 1021.34375 561.378906 L 1021.421875 561.730469 L 1021.519531 562.027344 L 1021.640625 562.28125 L 1021.757812 562.476562 L 1021.894531 562.652344 L 1022.050781 562.8125 L 1022.246094 562.96875 L 1022.464844 563.105469 L 1022.71875 563.242188 L 1022.855469 563.300781 L 1023.011719 563.359375 L 1023.191406 563.421875 L 1023.40625 563.5 L 1023.621094 563.558594 L 1023.878906 563.636719 L 1023.878906 564.773438 L 1009.957031 564.773438 L 1009.957031 563.046875 Z M 1019.871094 563.046875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1007.480469 580.207031 L 1006.5 580.207031 L 1006.5 568.425781 L 1007.480469 568.425781 Z M 1007.480469 580.207031 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1020.539062 585.097656 L 1020.480469 585.902344 L 1020.324219 586.628906 L 1020.066406 587.296875 L 1019.695312 587.886719 L 1019.222656 588.394531 L 1018.675781 588.847656 L 1018.164062 589.121094 L 1017.613281 589.339844 L 1017.003906 589.535156 L 1016.375 589.652344 L 1015.667969 589.730469 L 1014.941406 589.769531 L 1014.039062 589.710938 L 1013.214844 589.59375 L 1012.46875 589.398438 L 1011.800781 589.101562 L 1011.210938 588.730469 L 1010.703125 588.296875 L 1010.328125 587.867188 L 1010.015625 587.394531 L 1009.820312 586.882812 L 1009.640625 586.335938 L 1009.542969 585.746094 L 1009.503906 585.117188 L 1009.5625 584.351562 L 1009.699219 583.644531 L 1009.9375 582.996094 L 1010.25 582.425781 L 1010.683594 581.917969 L 1011.230469 581.484375 L 1011.722656 581.152344 L 1012.292969 580.894531 L 1012.882812 580.699219 L 1013.550781 580.5625 L 1014.257812 580.484375 L 1015.023438 580.464844 L 1015.945312 580.503906 L 1016.789062 580.621094 L 1017.554688 580.835938 L 1018.242188 581.132812 L 1018.851562 581.523438 L 1019.378906 581.996094 L 1019.714844 582.40625 L 1020.007812 582.859375 L 1020.246094 583.371094 L 1020.402344 583.898438 L 1020.5 584.46875 Z M 1019.027344 585.117188 L 1018.988281 584.625 L 1018.871094 584.175781 L 1018.695312 583.761719 L 1018.4375 583.410156 L 1018.105469 583.074219 L 1017.710938 582.800781 L 1017.339844 582.605469 L 1016.925781 582.445312 L 1016.496094 582.328125 L 1016.023438 582.230469 L 1015.53125 582.171875 L 1015.023438 582.171875 L 1014.296875 582.191406 L 1013.628906 582.289062 L 1013.039062 582.445312 L 1012.507812 582.664062 L 1012.058594 582.957031 L 1011.683594 583.3125 L 1011.46875 583.546875 L 1011.292969 583.820312 L 1011.171875 584.117188 L 1011.074219 584.429688 L 1011.015625 584.765625 L 1011.015625 585.117188 L 1011.035156 585.589844 L 1011.152344 586.039062 L 1011.332031 586.433594 L 1011.585938 586.804688 L 1011.898438 587.121094 L 1012.3125 587.414062 L 1012.664062 587.609375 L 1013.058594 587.769531 L 1013.488281 587.886719 L 1013.941406 587.984375 L 1014.433594 588.042969 L 1014.960938 588.0625 L 1015.730469 588.023438 L 1016.414062 587.925781 L 1017.023438 587.75 L 1017.574219 587.511719 L 1018.027344 587.199219 L 1018.417969 586.84375 L 1018.59375 586.589844 L 1018.753906 586.335938 L 1018.871094 586.058594 L 1018.949219 585.765625 L 1019.007812 585.449219 Z M 1019.027344 585.117188 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 1024.269531 593.421875 L 1015.886719 593.421875 L 1020.246094 597.78125 L 1020.246094 599.882812 L 1016.691406 596.308594 L 1009.957031 600.511719 L 1009.957031 598.488281 L 1015.53125 595.011719 L 1013.960938 593.421875 L 1009.957031 593.421875 L 1009.957031 591.792969 L 1024.269531 591.792969 Z M 1024.269531 593.421875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 994.070312 465.875 L 994.070312 467.386719 L 992.339844 467.386719 L 992.773438 467.679688 L 993.167969 467.996094 L 993.5 468.328125 L 993.773438 468.683594 L 993.992188 469.054688 L 994.167969 469.449219 L 994.226562 469.644531 L 994.265625 469.859375 L 994.304688 470.078125 L 994.34375 470.546875 L 994.363281 470.804688 L 994.324219 471.351562 L 994.246094 471.863281 L 994.109375 472.316406 L 993.914062 472.746094 L 993.65625 473.101562 L 993.34375 473.433594 L 993.085938 473.609375 L 992.8125 473.769531 L 992.519531 473.886719 L 992.222656 473.984375 L 991.890625 474.042969 L 991.554688 474.0625 L 983.78125 474.0625 L 983.78125 472.433594 L 990.90625 472.433594 L 991.261719 472.394531 L 991.59375 472.335938 L 991.910156 472.195312 L 992.164062 472.039062 L 992.402344 471.804688 L 992.617188 471.550781 L 992.714844 471.371094 L 992.792969 471.175781 L 992.851562 470.980469 L 992.890625 470.765625 L 992.910156 470.546875 L 992.929688 470.3125 L 992.890625 469.859375 L 992.792969 469.449219 L 992.636719 469.074219 L 992.421875 468.722656 L 992.144531 468.40625 L 991.8125 468.152344 L 991.476562 467.957031 L 991.125 467.796875 L 990.75 467.679688 L 990.339844 467.582031 L 989.90625 467.523438 L 983.78125 467.523438 L 983.78125 465.875 Z M 994.070312 465.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 994.363281 480.738281 L 994.304688 481.542969 L 994.148438 482.269531 L 993.894531 482.9375 L 993.519531 483.527344 L 993.046875 484.039062 L 992.5 484.488281 L 991.988281 484.765625 L 991.4375 484.980469 L 990.828125 485.175781 L 990.203125 485.292969 L 989.496094 485.371094 L 988.769531 485.410156 L 987.863281 485.351562 L 987.039062 485.234375 L 986.292969 485.039062 L 985.625 484.742188 L 985.039062 484.371094 L 984.527344 483.9375 L 984.152344 483.507812 L 983.839844 483.035156 L 983.644531 482.523438 L 983.464844 481.976562 L 983.367188 481.386719 L 983.328125 480.757812 L 983.386719 479.992188 L 983.523438 479.285156 L 983.761719 478.636719 L 984.074219 478.066406 L 984.507812 477.558594 L 985.058594 477.125 L 985.546875 476.792969 L 986.117188 476.535156 L 986.707031 476.339844 L 987.375 476.203125 L 988.082031 476.125 L 988.847656 476.105469 L 989.769531 476.144531 L 990.613281 476.261719 L 991.378906 476.476562 L 992.066406 476.773438 L 992.675781 477.164062 L 993.207031 477.636719 L 993.539062 478.046875 L 993.832031 478.5 L 994.070312 479.011719 L 994.226562 479.539062 L 994.324219 480.109375 Z M 992.851562 480.757812 L 992.8125 480.265625 L 992.695312 479.816406 L 992.519531 479.402344 L 992.261719 479.050781 L 991.929688 478.714844 L 991.535156 478.441406 L 991.164062 478.246094 L 990.75 478.085938 L 990.320312 477.96875 L 989.847656 477.871094 L 989.355469 477.8125 L 988.847656 477.8125 L 988.121094 477.832031 L 987.453125 477.929688 L 986.863281 478.085938 L 986.332031 478.304688 L 985.882812 478.597656 L 985.507812 478.953125 L 985.292969 479.1875 L 985.117188 479.460938 L 984.996094 479.757812 L 984.898438 480.070312 L 984.839844 480.40625 L 984.839844 480.757812 L 984.859375 481.230469 L 984.976562 481.679688 L 985.15625 482.074219 L 985.410156 482.445312 L 985.722656 482.761719 L 986.136719 483.054688 L 986.488281 483.25 L 986.882812 483.410156 L 987.316406 483.527344 L 987.765625 483.625 L 988.257812 483.683594 L 988.789062 483.703125 L 989.554688 483.664062 L 990.242188 483.566406 L 990.847656 483.390625 L 991.398438 483.152344 L 991.851562 482.839844 L 992.242188 482.484375 L 992.421875 482.230469 L 992.578125 481.976562 L 992.695312 481.699219 L 992.773438 481.40625 L 992.832031 481.09375 Z M 992.851562 480.757812 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 981.304688 497.644531 L 980.324219 497.644531 L 980.324219 485.863281 L 981.304688 485.863281 Z M 981.304688 497.644531 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 998.09375 500.195312 L 996.03125 500.195312 L 996.03125 498.566406 L 998.09375 498.566406 Z M 994.070312 498.566406 L 994.070312 500.195312 L 981.640625 500.195312 L 981.109375 500.136719 L 980.640625 499.960938 L 980.246094 499.6875 L 979.953125 499.292969 L 979.714844 498.804688 L 979.558594 498.214844 L 979.558594 498.078125 L 979.539062 497.9375 L 979.519531 497.800781 L 979.519531 497.527344 L 979.5 497.390625 L 979.519531 497.292969 L 979.519531 497.132812 L 979.558594 496.9375 L 979.558594 496.839844 L 980.953125 496.839844 L 980.953125 497.191406 L 980.933594 497.230469 L 980.953125 497.507812 L 980.992188 497.742188 L 981.050781 497.957031 L 981.128906 498.136719 L 981.246094 498.273438 L 981.367188 498.390625 L 981.484375 498.429688 L 981.621094 498.488281 L 981.757812 498.507812 L 981.914062 498.546875 L 982.09375 498.546875 L 982.289062 498.566406 Z M 994.070312 498.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 983.78125 510.996094 L 983.78125 509.523438 L 985.214844 509.523438 L 984.800781 509.210938 L 984.449219 508.894531 L 984.132812 508.5625 L 983.898438 508.226562 L 983.703125 507.875 L 983.542969 507.519531 L 983.484375 507.304688 L 983.445312 507.070312 L 983.386719 506.832031 L 983.367188 506.597656 L 983.347656 506.34375 L 983.328125 506.085938 L 983.367188 505.519531 L 983.445312 505.007812 L 983.605469 504.535156 L 983.78125 504.125 L 984.035156 503.75 L 984.371094 503.4375 L 984.605469 503.242188 L 984.878906 503.082031 L 985.15625 502.964844 L 985.46875 502.867188 L 985.785156 502.808594 L 994.070312 502.808594 L 994.070312 504.4375 L 986.785156 504.4375 L 986.390625 504.457031 L 986.058594 504.535156 L 985.765625 504.652344 L 985.488281 504.832031 L 985.253906 505.046875 L 985.078125 505.320312 L 984.957031 505.480469 L 984.878906 505.675781 L 984.820312 505.871094 L 984.78125 506.085938 L 984.761719 506.304688 L 984.761719 506.558594 L 984.78125 507.011719 L 984.878906 507.421875 L 985.039062 507.796875 L 985.253906 508.148438 L 985.527344 508.464844 L 985.882812 508.738281 L 986.195312 508.914062 L 986.550781 509.070312 L 986.941406 509.191406 L 987.335938 509.289062 L 987.765625 509.347656 L 988.238281 509.367188 L 994.070312 509.367188 L 994.070312 510.996094 Z M 983.78125 510.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 994.070312 513.804688 L 994.070312 515.316406 L 992.617188 515.316406 L 993.007812 515.609375 L 993.34375 515.925781 L 993.636719 516.238281 L 993.875 516.59375 L 994.070312 516.925781 L 994.207031 517.300781 L 994.246094 517.457031 L 994.285156 517.652344 L 994.304688 517.828125 L 994.34375 518.046875 L 994.34375 518.242188 L 994.363281 518.476562 L 994.324219 518.949219 L 994.246094 519.402344 L 994.128906 519.8125 L 993.953125 520.167969 L 993.734375 520.5 L 993.460938 520.792969 L 993.363281 520.851562 L 993.265625 520.933594 L 993.148438 521.011719 L 993.027344 521.089844 L 992.792969 521.246094 L 993.125 521.539062 L 993.421875 521.855469 L 993.675781 522.148438 L 993.875 522.464844 L 994.050781 522.777344 L 994.1875 523.09375 L 994.226562 523.269531 L 994.285156 523.484375 L 994.304688 523.679688 L 994.34375 523.917969 L 994.34375 524.152344 L 994.363281 524.40625 L 994.304688 525.035156 L 994.1875 525.605469 L 993.992188 526.097656 L 993.714844 526.507812 L 993.363281 526.84375 L 992.929688 527.117188 L 992.714844 527.195312 L 992.480469 527.253906 L 992.261719 527.3125 L 992.007812 527.351562 L 991.753906 527.371094 L 991.496094 527.390625 L 983.78125 527.390625 L 983.78125 525.742188 L 990.867188 525.742188 L 991.28125 525.703125 L 991.675781 525.625 L 991.988281 525.507812 L 992.28125 525.3125 L 992.519531 525.074219 L 992.714844 524.800781 L 992.773438 524.644531 L 992.8125 524.503906 L 992.871094 524.347656 L 992.890625 524.191406 L 992.929688 523.839844 L 992.890625 523.484375 L 992.832031 523.171875 L 992.714844 522.875 L 992.558594 522.582031 L 992.339844 522.324219 L 992.105469 522.089844 L 991.832031 521.875 L 991.535156 521.699219 L 991.242188 521.578125 L 990.929688 521.480469 L 990.59375 521.421875 L 983.78125 521.421875 L 983.78125 519.773438 L 990.867188 519.773438 L 991.320312 519.734375 L 991.734375 519.636719 L 992.085938 519.5 L 992.359375 519.28125 L 992.597656 519.007812 L 992.773438 518.695312 L 992.8125 518.554688 L 992.851562 518.4375 L 992.871094 518.300781 L 992.910156 518.164062 L 992.910156 518.007812 L 992.929688 517.867188 L 992.890625 517.515625 L 992.832031 517.203125 L 992.714844 516.90625 L 992.558594 516.613281 L 992.339844 516.355469 L 992.105469 516.121094 L 991.832031 515.90625 L 991.535156 515.730469 L 991.242188 515.609375 L 990.929688 515.511719 L 990.59375 515.453125 L 983.78125 515.453125 L 983.78125 513.804688 Z M 994.070312 513.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 979.5 529.828125 L 994.070312 529.828125 L 994.070312 531.339844 L 992.519531 531.339844 L 993.066406 531.730469 L 993.539062 532.203125 L 993.894531 532.734375 L 994.148438 533.300781 L 994.304688 533.929688 L 994.363281 534.617188 L 994.304688 535.285156 L 994.1875 535.914062 L 993.953125 536.484375 L 993.65625 537.011719 L 993.246094 537.484375 L 992.773438 537.917969 L 992.242188 538.25 L 991.652344 538.523438 L 991.007812 538.742188 L 990.300781 538.898438 L 989.554688 538.996094 L 988.75 539.035156 L 987.921875 538.996094 L 987.15625 538.878906 L 986.449219 538.703125 L 985.804688 538.445312 L 985.214844 538.132812 L 984.683594 537.738281 L 984.25 537.308594 L 983.917969 536.855469 L 983.683594 536.367188 L 983.484375 535.816406 L 983.367188 535.246094 L 983.328125 534.636719 L 983.367188 534.105469 L 983.445312 533.617188 L 983.605469 533.144531 L 983.78125 532.714844 L 984.035156 532.300781 L 984.371094 531.929688 L 984.449219 531.847656 L 984.761719 531.535156 L 984.859375 531.476562 L 979.5 531.476562 Z M 992.832031 534.34375 L 992.792969 533.890625 L 992.695312 533.480469 L 992.519531 533.105469 L 992.28125 532.753906 L 991.96875 532.4375 L 991.59375 532.164062 L 991.222656 531.949219 L 990.808594 531.769531 L 990.359375 531.632812 L 989.886719 531.535156 L 989.375 531.476562 L 988.847656 531.476562 L 988.160156 531.496094 L 987.550781 531.574219 L 986.980469 531.710938 L 986.46875 531.90625 L 986.019531 532.164062 L 985.644531 532.496094 L 985.390625 532.753906 L 985.195312 533.027344 L 985.039062 533.320312 L 984.9375 533.636719 L 984.878906 533.96875 L 984.859375 534.34375 L 984.878906 534.773438 L 984.976562 535.1875 L 985.15625 535.578125 L 985.371094 535.933594 L 985.664062 536.265625 L 986.039062 536.5625 L 986.390625 536.777344 L 986.804688 536.972656 L 987.257812 537.132812 L 987.726562 537.230469 L 988.238281 537.289062 L 988.789062 537.328125 L 989.457031 537.289062 L 990.0625 537.210938 L 990.632812 537.050781 L 991.144531 536.855469 L 991.59375 536.601562 L 991.988281 536.285156 L 992.242188 536.011719 L 992.460938 535.71875 L 992.617188 535.402344 L 992.734375 535.070312 L 992.792969 534.714844 Z M 992.832031 534.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 988.375 549.738281 L 988.375 542.15625 L 987.960938 542.15625 L 987.589844 542.195312 L 987.234375 542.257812 L 986.921875 542.335938 L 986.648438 542.433594 L 986.410156 542.550781 L 986.175781 542.707031 L 985.804688 542.960938 L 985.488281 543.257812 L 985.253906 543.609375 L 985.058594 543.984375 L 984.917969 544.394531 L 984.859375 544.847656 L 984.839844 544.886719 L 984.839844 545.179688 L 984.878906 545.808594 L 985.058594 546.359375 L 985.351562 546.851562 L 985.742188 547.261719 L 986.253906 547.597656 L 986.902344 547.871094 L 986.902344 549.519531 L 986.253906 549.34375 L 985.664062 549.128906 L 985.136719 548.832031 L 984.683594 548.480469 L 984.292969 548.046875 L 983.957031 547.578125 L 983.78125 547.203125 L 983.625 546.832031 L 983.503906 546.4375 L 983.40625 546.007812 L 983.347656 545.574219 L 983.328125 545.121094 L 983.386719 544.375 L 983.523438 543.707031 L 983.742188 543.101562 L 984.035156 542.550781 L 984.429688 542.039062 L 984.917969 541.609375 L 985.410156 541.253906 L 985.980469 540.960938 L 986.609375 540.722656 L 987.277344 540.566406 L 988.003906 540.46875 L 988.789062 540.449219 L 989.613281 540.46875 L 990.398438 540.585938 L 991.125 540.785156 L 991.773438 541.039062 L 992.378906 541.371094 L 992.929688 541.804688 L 993.363281 542.234375 L 993.714844 542.726562 L 993.992188 543.277344 L 994.1875 543.847656 L 994.304688 544.476562 L 994.363281 545.160156 L 994.324219 545.769531 L 994.226562 546.339844 L 994.070312 546.871094 L 993.832031 547.378906 L 993.539062 547.851562 L 993.1875 548.304688 L 992.949219 548.519531 L 992.714844 548.714844 L 992.480469 548.894531 L 992.203125 549.050781 L 991.929688 549.1875 L 991.652344 549.324219 L 991.242188 549.441406 L 990.789062 549.539062 L 990.28125 549.621094 L 989.691406 549.679688 L 989.0625 549.71875 Z M 989.710938 542.195312 L 989.710938 547.96875 L 989.789062 547.96875 L 989.828125 547.988281 L 990.242188 547.949219 L 990.652344 547.890625 L 991.027344 547.753906 L 991.378906 547.597656 L 991.695312 547.378906 L 992.007812 547.125 L 992.261719 546.832031 L 992.480469 546.535156 L 992.636719 546.203125 L 992.753906 545.867188 L 992.8125 545.515625 L 992.851562 545.140625 L 992.8125 544.671875 L 992.714844 544.238281 L 992.558594 543.847656 L 992.339844 543.492188 L 992.066406 543.160156 L 991.734375 542.882812 L 991.4375 542.6875 L 991.144531 542.53125 L 990.808594 542.414062 L 990.457031 542.296875 L 990.082031 542.234375 Z M 989.710938 542.195312 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 992.636719 556.863281 L 992.597656 556.316406 L 992.539062 555.84375 L 992.441406 555.410156 L 992.300781 555.019531 L 992.125 554.683594 L 991.910156 554.429688 L 991.59375 554.15625 L 991.242188 553.9375 L 990.808594 553.78125 L 990.300781 553.644531 L 989.730469 553.585938 L 989.121094 553.566406 L 983.78125 553.566406 L 983.78125 551.917969 L 994.070312 551.917969 L 994.070312 553.429688 L 992.203125 553.429688 L 992.675781 553.742188 L 993.105469 554.058594 L 993.460938 554.371094 L 993.753906 554.664062 L 993.992188 554.980469 L 994.167969 555.292969 L 994.226562 555.429688 L 994.265625 555.589844 L 994.304688 555.746094 L 994.34375 556.058594 L 994.363281 556.234375 L 994.34375 556.296875 L 994.34375 556.492188 L 994.304688 556.726562 L 994.304688 556.863281 Z M 992.636719 556.863281 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 981.304688 568.429688 L 980.324219 568.429688 L 980.324219 556.648438 L 981.304688 556.648438 Z M 981.304688 568.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 990.613281 577.226562 L 990.613281 575.578125 L 991.105469 575.460938 L 991.554688 575.300781 L 991.949219 575.085938 L 992.261719 574.8125 L 992.5 574.476562 L 992.695312 574.105469 L 992.734375 573.949219 L 992.773438 573.789062 L 992.792969 573.632812 L 992.832031 573.476562 L 992.832031 573.300781 L 992.851562 573.140625 L 992.792969 572.632812 L 992.675781 572.179688 L 992.480469 571.769531 L 992.183594 571.394531 L 991.8125 571.082031 L 991.378906 570.824219 L 991.007812 570.648438 L 990.613281 570.53125 L 990.203125 570.414062 L 989.257812 570.296875 L 988.75 570.296875 L 988.003906 570.316406 L 987.355469 570.414062 L 986.765625 570.589844 L 986.253906 570.804688 L 985.804688 571.101562 L 985.429688 571.472656 L 985.234375 571.707031 L 985.097656 571.964844 L 984.976562 572.238281 L 984.898438 572.535156 L 984.839844 572.847656 L 984.839844 573.179688 L 984.898438 573.828125 L 985.117188 574.378906 L 985.449219 574.851562 L 985.941406 575.222656 L 986.550781 575.5 L 987.316406 575.695312 L 987.316406 577.34375 L 986.570312 577.246094 L 985.921875 577.070312 L 985.332031 576.8125 L 984.820312 576.480469 L 984.371094 576.066406 L 983.996094 575.597656 L 983.78125 575.242188 L 983.625 574.871094 L 983.503906 574.476562 L 983.40625 574.046875 L 983.347656 573.59375 L 983.328125 573.140625 L 983.386719 572.457031 L 983.503906 571.828125 L 983.722656 571.238281 L 983.996094 570.707031 L 984.371094 570.214844 L 984.839844 569.785156 L 985.332031 569.410156 L 985.902344 569.097656 L 986.53125 568.882812 L 987.214844 568.703125 L 987.941406 568.605469 L 988.75 568.585938 L 989.59375 568.605469 L 990.378906 568.722656 L 991.105469 568.921875 L 991.773438 569.175781 L 992.378906 569.511719 L 992.929688 569.921875 L 993.363281 570.355469 L 993.714844 570.824219 L 993.992188 571.335938 L 994.1875 571.90625 L 994.304688 572.515625 L 994.363281 573.160156 L 994.304688 573.886719 L 994.1875 574.554688 L 993.953125 575.164062 L 993.65625 575.695312 L 993.246094 576.148438 L 992.773438 576.539062 L 992.460938 576.714844 L 992.144531 576.875 L 991.792969 576.992188 L 991.417969 577.109375 L 991.027344 577.167969 Z M 990.613281 577.226562 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 990.90625 585.707031 L 991.339844 585.667969 L 991.714844 585.570312 L 992.046875 585.414062 L 992.320312 585.179688 L 992.558594 584.882812 L 992.753906 584.550781 L 992.792969 584.394531 L 992.851562 584.234375 L 992.871094 584.078125 L 992.910156 583.902344 L 992.910156 583.746094 L 992.929688 583.589844 L 992.890625 583.136719 L 992.792969 582.722656 L 992.636719 582.351562 L 992.421875 581.996094 L 992.144531 581.683594 L 991.8125 581.429688 L 991.476562 581.230469 L 991.125 581.074219 L 990.75 580.957031 L 990.339844 580.859375 L 989.90625 580.800781 L 983.78125 580.800781 L 983.78125 579.171875 L 998.09375 579.171875 L 998.09375 580.800781 L 992.65625 580.800781 L 993.007812 581.09375 L 993.34375 581.410156 L 993.617188 581.722656 L 993.851562 582.039062 L 994.03125 582.351562 L 994.167969 582.683594 L 994.226562 582.882812 L 994.265625 583.097656 L 994.304688 583.332031 L 994.324219 583.570312 L 994.34375 583.824219 L 994.363281 584.097656 L 994.324219 584.667969 L 994.226562 585.199219 L 994.089844 585.667969 L 993.875 586.082031 L 993.597656 586.457031 L 993.285156 586.769531 L 993.027344 586.925781 L 992.773438 587.0625 L 992.5 587.179688 L 992.203125 587.261719 L 991.890625 587.320312 L 991.554688 587.339844 L 983.78125 587.339844 L 983.78125 585.707031 Z M 990.90625 585.707031 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 988.375 598.765625 L 988.375 591.1875 L 987.960938 591.1875 L 987.589844 591.226562 L 987.234375 591.285156 L 986.921875 591.363281 L 986.648438 591.460938 L 986.410156 591.578125 L 986.175781 591.738281 L 985.804688 591.992188 L 985.488281 592.285156 L 985.253906 592.640625 L 985.058594 593.011719 L 984.917969 593.425781 L 984.859375 593.878906 L 984.839844 593.917969 L 984.839844 594.210938 L 984.878906 594.839844 L 985.058594 595.390625 L 985.351562 595.878906 L 985.742188 596.292969 L 986.253906 596.625 L 986.902344 596.902344 L 986.902344 598.550781 L 986.253906 598.375 L 985.664062 598.15625 L 985.136719 597.863281 L 984.683594 597.511719 L 984.292969 597.078125 L 983.957031 596.605469 L 983.78125 596.234375 L 983.625 595.859375 L 983.503906 595.46875 L 983.40625 595.035156 L 983.347656 594.605469 L 983.328125 594.152344 L 983.386719 593.40625 L 983.523438 592.738281 L 983.742188 592.128906 L 984.035156 591.578125 L 984.429688 591.070312 L 984.917969 590.636719 L 985.410156 590.285156 L 985.980469 589.988281 L 986.609375 589.753906 L 987.277344 589.597656 L 988.003906 589.5 L 988.789062 589.480469 L 989.613281 589.5 L 990.398438 589.617188 L 991.125 589.8125 L 991.773438 590.066406 L 992.378906 590.402344 L 992.929688 590.832031 L 993.363281 591.265625 L 993.714844 591.757812 L 993.992188 592.304688 L 994.1875 592.875 L 994.304688 593.503906 L 994.363281 594.191406 L 994.324219 594.800781 L 994.226562 595.371094 L 994.070312 595.898438 L 993.832031 596.410156 L 993.539062 596.882812 L 993.1875 597.332031 L 992.949219 597.550781 L 992.714844 597.746094 L 992.480469 597.921875 L 992.203125 598.078125 L 991.929688 598.214844 L 991.652344 598.355469 L 991.242188 598.472656 L 990.789062 598.570312 L 990.28125 598.648438 L 989.691406 598.707031 L 989.0625 598.746094 Z M 989.710938 591.226562 L 989.710938 597 L 989.789062 597 L 989.828125 597.019531 L 990.242188 596.980469 L 990.652344 596.921875 L 991.027344 596.785156 L 991.378906 596.625 L 991.695312 596.410156 L 992.007812 596.15625 L 992.261719 595.859375 L 992.480469 595.566406 L 992.636719 595.230469 L 992.753906 594.898438 L 992.8125 594.542969 L 992.851562 594.171875 L 992.8125 593.699219 L 992.714844 593.269531 L 992.558594 592.875 L 992.339844 592.523438 L 992.066406 592.1875 L 991.734375 591.914062 L 991.4375 591.71875 L 991.144531 591.558594 L 990.808594 591.441406 L 990.457031 591.324219 L 990.082031 591.265625 Z M 989.710938 591.226562 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 990.613281 608.839844 L 990.613281 607.191406 L 991.105469 607.070312 L 991.554688 606.914062 L 991.949219 606.699219 L 992.261719 606.425781 L 992.5 606.089844 L 992.695312 605.71875 L 992.734375 605.558594 L 992.773438 605.402344 L 992.792969 605.246094 L 992.832031 605.089844 L 992.832031 604.914062 L 992.851562 604.753906 L 992.792969 604.246094 L 992.675781 603.792969 L 992.480469 603.378906 L 992.183594 603.007812 L 991.8125 602.695312 L 991.378906 602.4375 L 991.007812 602.261719 L 990.613281 602.144531 L 990.203125 602.027344 L 989.730469 601.96875 L 989.257812 601.90625 L 988.75 601.90625 L 988.003906 601.929688 L 987.355469 602.027344 L 986.765625 602.203125 L 986.253906 602.417969 L 985.804688 602.714844 L 985.429688 603.085938 L 985.234375 603.320312 L 985.097656 603.578125 L 984.976562 603.851562 L 984.898438 604.148438 L 984.839844 604.460938 L 984.839844 604.792969 L 984.898438 605.441406 L 985.117188 605.992188 L 985.449219 606.464844 L 985.941406 606.835938 L 986.550781 607.113281 L 987.316406 607.308594 L 987.316406 608.957031 L 986.570312 608.859375 L 985.921875 608.683594 L 985.332031 608.425781 L 984.820312 608.09375 L 984.371094 607.679688 L 983.996094 607.210938 L 983.78125 606.855469 L 983.625 606.484375 L 983.503906 606.089844 L 983.40625 605.660156 L 983.347656 605.207031 L 983.328125 604.753906 L 983.386719 604.066406 L 983.503906 603.441406 L 983.722656 602.851562 L 983.996094 602.320312 L 984.371094 601.828125 L 984.839844 601.398438 L 985.332031 601.023438 L 985.902344 600.710938 L 986.53125 600.496094 L 987.214844 600.316406 L 987.941406 600.21875 L 988.75 600.199219 L 989.59375 600.21875 L 990.378906 600.335938 L 991.105469 600.535156 L 991.773438 600.789062 L 992.378906 601.121094 L 992.929688 601.535156 L 993.363281 601.96875 L 993.714844 602.4375 L 993.992188 602.949219 L 994.1875 603.519531 L 994.304688 604.125 L 994.363281 604.773438 L 994.304688 605.5 L 994.1875 606.167969 L 993.953125 606.777344 L 993.65625 607.308594 L 993.246094 607.757812 L 992.773438 608.152344 L 992.460938 608.328125 L 992.144531 608.484375 L 991.792969 608.605469 L 991.417969 608.722656 L 991.027344 608.78125 Z M 990.613281 608.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 998.09375 612.175781 L 989.710938 612.175781 L 994.070312 616.535156 L 994.070312 618.636719 L 990.515625 615.0625 L 983.78125 619.265625 L 983.78125 617.242188 L 989.355469 613.769531 L 987.785156 612.175781 L 983.78125 612.175781 L 983.78125 610.546875 L 998.09375 610.546875 Z M 998.09375 612.175781 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 935.070312 465.875 L 935.070312 467.386719 L 933.339844 467.386719 L 933.773438 467.679688 L 934.167969 467.996094 L 934.5 468.328125 L 934.773438 468.683594 L 934.992188 469.054688 L 935.167969 469.449219 L 935.226562 469.644531 L 935.265625 469.859375 L 935.304688 470.078125 L 935.34375 470.546875 L 935.363281 470.804688 L 935.324219 471.351562 L 935.246094 471.863281 L 935.109375 472.316406 L 934.914062 472.746094 L 934.65625 473.101562 L 934.34375 473.433594 L 934.085938 473.609375 L 933.8125 473.769531 L 933.519531 473.886719 L 933.222656 473.984375 L 932.890625 474.042969 L 932.554688 474.0625 L 924.78125 474.0625 L 924.78125 472.433594 L 931.90625 472.433594 L 932.261719 472.394531 L 932.59375 472.335938 L 932.910156 472.195312 L 933.164062 472.039062 L 933.402344 471.804688 L 933.617188 471.550781 L 933.714844 471.371094 L 933.792969 471.175781 L 933.851562 470.980469 L 933.890625 470.765625 L 933.910156 470.546875 L 933.929688 470.3125 L 933.890625 469.859375 L 933.792969 469.449219 L 933.636719 469.074219 L 933.421875 468.722656 L 933.144531 468.40625 L 932.8125 468.152344 L 932.476562 467.957031 L 932.125 467.796875 L 931.75 467.679688 L 931.339844 467.582031 L 930.90625 467.523438 L 924.78125 467.523438 L 924.78125 465.875 Z M 935.070312 465.875 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 935.363281 480.738281 L 935.304688 481.542969 L 935.148438 482.269531 L 934.894531 482.9375 L 934.519531 483.527344 L 934.046875 484.039062 L 933.5 484.488281 L 932.988281 484.765625 L 932.4375 484.980469 L 931.828125 485.175781 L 931.203125 485.292969 L 930.496094 485.371094 L 929.769531 485.410156 L 928.863281 485.351562 L 928.039062 485.234375 L 927.292969 485.039062 L 926.625 484.742188 L 926.039062 484.371094 L 925.527344 483.9375 L 925.152344 483.507812 L 924.839844 483.035156 L 924.644531 482.523438 L 924.464844 481.976562 L 924.367188 481.386719 L 924.328125 480.757812 L 924.386719 479.992188 L 924.523438 479.285156 L 924.761719 478.636719 L 925.074219 478.066406 L 925.507812 477.558594 L 926.058594 477.125 L 926.546875 476.792969 L 927.117188 476.535156 L 927.707031 476.339844 L 928.375 476.203125 L 929.082031 476.125 L 929.847656 476.105469 L 930.769531 476.144531 L 931.613281 476.261719 L 932.378906 476.476562 L 933.066406 476.773438 L 933.675781 477.164062 L 934.207031 477.636719 L 934.539062 478.046875 L 934.832031 478.5 L 935.070312 479.011719 L 935.226562 479.539062 L 935.324219 480.109375 Z M 933.851562 480.757812 L 933.8125 480.265625 L 933.695312 479.816406 L 933.519531 479.402344 L 933.261719 479.050781 L 932.929688 478.714844 L 932.535156 478.441406 L 932.164062 478.246094 L 931.75 478.085938 L 931.320312 477.96875 L 930.847656 477.871094 L 930.355469 477.8125 L 929.847656 477.8125 L 929.121094 477.832031 L 928.453125 477.929688 L 927.863281 478.085938 L 927.332031 478.304688 L 926.882812 478.597656 L 926.507812 478.953125 L 926.292969 479.1875 L 926.117188 479.460938 L 925.996094 479.757812 L 925.898438 480.070312 L 925.839844 480.40625 L 925.839844 480.757812 L 925.859375 481.230469 L 925.976562 481.679688 L 926.15625 482.074219 L 926.410156 482.445312 L 926.722656 482.761719 L 927.136719 483.054688 L 927.488281 483.25 L 927.882812 483.410156 L 928.316406 483.527344 L 928.765625 483.625 L 929.257812 483.683594 L 929.789062 483.703125 L 930.554688 483.664062 L 931.242188 483.566406 L 931.847656 483.390625 L 932.398438 483.152344 L 932.851562 482.839844 L 933.242188 482.484375 L 933.421875 482.230469 L 933.578125 481.976562 L 933.695312 481.699219 L 933.773438 481.40625 L 933.832031 481.09375 Z M 933.851562 480.757812 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 922.304688 497.644531 L 921.324219 497.644531 L 921.324219 485.863281 L 922.304688 485.863281 Z M 922.304688 497.644531 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 939.09375 500.195312 L 937.03125 500.195312 L 937.03125 498.566406 L 939.09375 498.566406 Z M 935.070312 498.566406 L 935.070312 500.195312 L 922.640625 500.195312 L 922.109375 500.136719 L 921.640625 499.960938 L 921.246094 499.6875 L 920.953125 499.292969 L 920.714844 498.804688 L 920.558594 498.214844 L 920.558594 498.078125 L 920.539062 497.9375 L 920.519531 497.800781 L 920.519531 497.527344 L 920.5 497.390625 L 920.519531 497.292969 L 920.519531 497.132812 L 920.558594 496.9375 L 920.558594 496.839844 L 921.953125 496.839844 L 921.953125 497.191406 L 921.933594 497.230469 L 921.953125 497.507812 L 921.992188 497.742188 L 922.050781 497.957031 L 922.128906 498.136719 L 922.246094 498.273438 L 922.367188 498.390625 L 922.484375 498.429688 L 922.621094 498.488281 L 922.757812 498.507812 L 922.914062 498.546875 L 923.09375 498.546875 L 923.289062 498.566406 Z M 935.070312 498.566406 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 924.78125 510.996094 L 924.78125 509.523438 L 926.214844 509.523438 L 925.800781 509.210938 L 925.449219 508.894531 L 925.132812 508.5625 L 924.898438 508.226562 L 924.703125 507.875 L 924.542969 507.519531 L 924.484375 507.304688 L 924.445312 507.070312 L 924.386719 506.832031 L 924.367188 506.597656 L 924.347656 506.34375 L 924.328125 506.085938 L 924.367188 505.519531 L 924.445312 505.007812 L 924.605469 504.535156 L 924.78125 504.125 L 925.035156 503.75 L 925.371094 503.4375 L 925.605469 503.242188 L 925.878906 503.082031 L 926.15625 502.964844 L 926.46875 502.867188 L 926.785156 502.808594 L 935.070312 502.808594 L 935.070312 504.4375 L 927.785156 504.4375 L 927.390625 504.457031 L 927.058594 504.535156 L 926.765625 504.652344 L 926.488281 504.832031 L 926.253906 505.046875 L 926.078125 505.320312 L 925.957031 505.480469 L 925.878906 505.675781 L 925.820312 505.871094 L 925.78125 506.085938 L 925.761719 506.304688 L 925.761719 506.558594 L 925.78125 507.011719 L 925.878906 507.421875 L 926.039062 507.796875 L 926.253906 508.148438 L 926.527344 508.464844 L 926.882812 508.738281 L 927.195312 508.914062 L 927.550781 509.070312 L 927.941406 509.191406 L 928.335938 509.289062 L 928.765625 509.347656 L 929.238281 509.367188 L 935.070312 509.367188 L 935.070312 510.996094 Z M 924.78125 510.996094 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 935.070312 513.804688 L 935.070312 515.316406 L 933.617188 515.316406 L 934.007812 515.609375 L 934.34375 515.925781 L 934.636719 516.238281 L 934.875 516.59375 L 935.070312 516.925781 L 935.207031 517.300781 L 935.246094 517.457031 L 935.285156 517.652344 L 935.304688 517.828125 L 935.34375 518.046875 L 935.34375 518.242188 L 935.363281 518.476562 L 935.324219 518.949219 L 935.246094 519.402344 L 935.128906 519.8125 L 934.953125 520.167969 L 934.734375 520.5 L 934.460938 520.792969 L 934.363281 520.851562 L 934.265625 520.933594 L 934.148438 521.011719 L 934.027344 521.089844 L 933.792969 521.246094 L 934.125 521.539062 L 934.421875 521.855469 L 934.675781 522.148438 L 934.875 522.464844 L 935.050781 522.777344 L 935.1875 523.09375 L 935.226562 523.269531 L 935.285156 523.484375 L 935.304688 523.679688 L 935.34375 523.917969 L 935.34375 524.152344 L 935.363281 524.40625 L 935.304688 525.035156 L 935.1875 525.605469 L 934.992188 526.097656 L 934.714844 526.507812 L 934.363281 526.84375 L 933.929688 527.117188 L 933.714844 527.195312 L 933.480469 527.253906 L 933.261719 527.3125 L 933.007812 527.351562 L 932.753906 527.371094 L 932.496094 527.390625 L 924.78125 527.390625 L 924.78125 525.742188 L 931.867188 525.742188 L 932.28125 525.703125 L 932.675781 525.625 L 932.988281 525.507812 L 933.28125 525.3125 L 933.519531 525.074219 L 933.714844 524.800781 L 933.773438 524.644531 L 933.8125 524.503906 L 933.871094 524.347656 L 933.890625 524.191406 L 933.929688 523.839844 L 933.890625 523.484375 L 933.832031 523.171875 L 933.714844 522.875 L 933.558594 522.582031 L 933.339844 522.324219 L 933.105469 522.089844 L 932.832031 521.875 L 932.535156 521.699219 L 932.242188 521.578125 L 931.929688 521.480469 L 931.59375 521.421875 L 924.78125 521.421875 L 924.78125 519.773438 L 931.867188 519.773438 L 932.320312 519.734375 L 932.734375 519.636719 L 933.085938 519.5 L 933.359375 519.28125 L 933.597656 519.007812 L 933.773438 518.695312 L 933.8125 518.554688 L 933.851562 518.4375 L 933.871094 518.300781 L 933.910156 518.164062 L 933.910156 518.007812 L 933.929688 517.867188 L 933.890625 517.515625 L 933.832031 517.203125 L 933.714844 516.90625 L 933.558594 516.613281 L 933.339844 516.355469 L 933.105469 516.121094 L 932.832031 515.90625 L 932.535156 515.730469 L 932.242188 515.609375 L 931.929688 515.511719 L 931.59375 515.453125 L 924.78125 515.453125 L 924.78125 513.804688 Z M 935.070312 513.804688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 920.5 529.828125 L 935.070312 529.828125 L 935.070312 531.339844 L 933.519531 531.339844 L 934.066406 531.730469 L 934.539062 532.203125 L 934.894531 532.734375 L 935.148438 533.300781 L 935.304688 533.929688 L 935.363281 534.617188 L 935.304688 535.285156 L 935.1875 535.914062 L 934.953125 536.484375 L 934.65625 537.011719 L 934.246094 537.484375 L 933.773438 537.917969 L 933.242188 538.25 L 932.652344 538.523438 L 932.007812 538.742188 L 931.300781 538.898438 L 930.554688 538.996094 L 929.75 539.035156 L 928.921875 538.996094 L 928.15625 538.878906 L 927.449219 538.703125 L 926.804688 538.445312 L 926.214844 538.132812 L 925.683594 537.738281 L 925.25 537.308594 L 924.917969 536.855469 L 924.683594 536.367188 L 924.484375 535.816406 L 924.367188 535.246094 L 924.328125 534.636719 L 924.367188 534.105469 L 924.445312 533.617188 L 924.605469 533.144531 L 924.78125 532.714844 L 925.035156 532.300781 L 925.371094 531.929688 L 925.449219 531.847656 L 925.761719 531.535156 L 925.859375 531.476562 L 920.5 531.476562 Z M 933.832031 534.34375 L 933.792969 533.890625 L 933.695312 533.480469 L 933.519531 533.105469 L 933.28125 532.753906 L 932.96875 532.4375 L 932.59375 532.164062 L 932.222656 531.949219 L 931.808594 531.769531 L 931.359375 531.632812 L 930.886719 531.535156 L 930.375 531.476562 L 929.847656 531.476562 L 929.160156 531.496094 L 928.550781 531.574219 L 927.980469 531.710938 L 927.46875 531.90625 L 927.019531 532.164062 L 926.644531 532.496094 L 926.390625 532.753906 L 926.195312 533.027344 L 926.039062 533.320312 L 925.9375 533.636719 L 925.878906 533.96875 L 925.859375 534.34375 L 925.878906 534.773438 L 925.976562 535.1875 L 926.15625 535.578125 L 926.371094 535.933594 L 926.664062 536.265625 L 927.039062 536.5625 L 927.390625 536.777344 L 927.804688 536.972656 L 928.257812 537.132812 L 928.726562 537.230469 L 929.238281 537.289062 L 929.789062 537.328125 L 930.457031 537.289062 L 931.0625 537.210938 L 931.632812 537.050781 L 932.144531 536.855469 L 932.59375 536.601562 L 932.988281 536.285156 L 933.242188 536.011719 L 933.460938 535.71875 L 933.617188 535.402344 L 933.734375 535.070312 L 933.792969 534.714844 Z M 933.832031 534.34375 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 929.375 549.738281 L 929.375 542.15625 L 928.960938 542.15625 L 928.589844 542.195312 L 928.234375 542.257812 L 927.921875 542.335938 L 927.648438 542.433594 L 927.410156 542.550781 L 927.175781 542.707031 L 926.804688 542.960938 L 926.488281 543.257812 L 926.253906 543.609375 L 926.058594 543.984375 L 925.917969 544.394531 L 925.859375 544.847656 L 925.839844 544.886719 L 925.839844 545.179688 L 925.878906 545.808594 L 926.058594 546.359375 L 926.351562 546.851562 L 926.742188 547.261719 L 927.253906 547.597656 L 927.902344 547.871094 L 927.902344 549.519531 L 927.253906 549.34375 L 926.664062 549.128906 L 926.136719 548.832031 L 925.683594 548.480469 L 925.292969 548.046875 L 924.957031 547.578125 L 924.78125 547.203125 L 924.625 546.832031 L 924.503906 546.4375 L 924.40625 546.007812 L 924.347656 545.574219 L 924.328125 545.121094 L 924.386719 544.375 L 924.523438 543.707031 L 924.742188 543.101562 L 925.035156 542.550781 L 925.429688 542.039062 L 925.917969 541.609375 L 926.410156 541.253906 L 926.980469 540.960938 L 927.609375 540.722656 L 928.277344 540.566406 L 929.003906 540.46875 L 929.789062 540.449219 L 930.613281 540.46875 L 931.398438 540.585938 L 932.125 540.785156 L 932.773438 541.039062 L 933.378906 541.371094 L 933.929688 541.804688 L 934.363281 542.234375 L 934.714844 542.726562 L 934.992188 543.277344 L 935.1875 543.847656 L 935.304688 544.476562 L 935.363281 545.160156 L 935.324219 545.769531 L 935.226562 546.339844 L 935.070312 546.871094 L 934.832031 547.378906 L 934.539062 547.851562 L 934.1875 548.304688 L 933.949219 548.519531 L 933.714844 548.714844 L 933.480469 548.894531 L 933.203125 549.050781 L 932.929688 549.1875 L 932.652344 549.324219 L 932.242188 549.441406 L 931.789062 549.539062 L 931.28125 549.621094 L 930.691406 549.679688 L 930.0625 549.71875 Z M 930.710938 542.195312 L 930.710938 547.96875 L 930.789062 547.96875 L 930.828125 547.988281 L 931.242188 547.949219 L 931.652344 547.890625 L 932.027344 547.753906 L 932.378906 547.597656 L 932.695312 547.378906 L 933.007812 547.125 L 933.261719 546.832031 L 933.480469 546.535156 L 933.636719 546.203125 L 933.753906 545.867188 L 933.8125 545.515625 L 933.851562 545.140625 L 933.8125 544.671875 L 933.714844 544.238281 L 933.558594 543.847656 L 933.339844 543.492188 L 933.066406 543.160156 L 932.734375 542.882812 L 932.4375 542.6875 L 932.144531 542.53125 L 931.808594 542.414062 L 931.457031 542.296875 L 931.082031 542.234375 Z M 930.710938 542.195312 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 933.636719 556.863281 L 933.597656 556.316406 L 933.539062 555.84375 L 933.441406 555.410156 L 933.300781 555.019531 L 933.125 554.683594 L 932.910156 554.429688 L 932.59375 554.15625 L 932.242188 553.9375 L 931.808594 553.78125 L 931.300781 553.644531 L 930.730469 553.585938 L 930.121094 553.566406 L 924.78125 553.566406 L 924.78125 551.917969 L 935.070312 551.917969 L 935.070312 553.429688 L 933.203125 553.429688 L 933.675781 553.742188 L 934.105469 554.058594 L 934.460938 554.371094 L 934.753906 554.664062 L 934.992188 554.980469 L 935.167969 555.292969 L 935.226562 555.429688 L 935.265625 555.589844 L 935.304688 555.746094 L 935.34375 556.058594 L 935.363281 556.234375 L 935.34375 556.296875 L 935.34375 556.492188 L 935.304688 556.726562 L 935.304688 556.863281 Z M 933.636719 556.863281 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 922.304688 568.429688 L 921.324219 568.429688 L 921.324219 556.648438 L 922.304688 556.648438 Z M 922.304688 568.429688 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 931.613281 577.226562 L 931.613281 575.578125 L 932.105469 575.460938 L 932.554688 575.300781 L 932.949219 575.085938 L 933.261719 574.8125 L 933.5 574.476562 L 933.695312 574.105469 L 933.734375 573.949219 L 933.773438 573.789062 L 933.792969 573.632812 L 933.832031 573.476562 L 933.832031 573.300781 L 933.851562 573.140625 L 933.792969 572.632812 L 933.675781 572.179688 L 933.480469 571.769531 L 933.183594 571.394531 L 932.8125 571.082031 L 932.378906 570.824219 L 932.007812 570.648438 L 931.613281 570.53125 L 931.203125 570.414062 L 930.257812 570.296875 L 929.75 570.296875 L 929.003906 570.316406 L 928.355469 570.414062 L 927.765625 570.589844 L 927.253906 570.804688 L 926.804688 571.101562 L 926.429688 571.472656 L 926.234375 571.707031 L 926.097656 571.964844 L 925.976562 572.238281 L 925.898438 572.535156 L 925.839844 572.847656 L 925.839844 573.179688 L 925.898438 573.828125 L 926.117188 574.378906 L 926.449219 574.851562 L 926.941406 575.222656 L 927.550781 575.5 L 928.316406 575.695312 L 928.316406 577.34375 L 927.570312 577.246094 L 926.921875 577.070312 L 926.332031 576.8125 L 925.820312 576.480469 L 925.371094 576.066406 L 924.996094 575.597656 L 924.78125 575.242188 L 924.625 574.871094 L 924.503906 574.476562 L 924.40625 574.046875 L 924.347656 573.59375 L 924.328125 573.140625 L 924.386719 572.457031 L 924.503906 571.828125 L 924.722656 571.238281 L 924.996094 570.707031 L 925.371094 570.214844 L 925.839844 569.785156 L 926.332031 569.410156 L 926.902344 569.097656 L 927.53125 568.882812 L 928.214844 568.703125 L 928.941406 568.605469 L 929.75 568.585938 L 930.59375 568.605469 L 931.378906 568.722656 L 932.105469 568.921875 L 932.773438 569.175781 L 933.378906 569.511719 L 933.929688 569.921875 L 934.363281 570.355469 L 934.714844 570.824219 L 934.992188 571.335938 L 935.1875 571.90625 L 935.304688 572.515625 L 935.363281 573.160156 L 935.304688 573.886719 L 935.1875 574.554688 L 934.953125 575.164062 L 934.65625 575.695312 L 934.246094 576.148438 L 933.773438 576.539062 L 933.460938 576.714844 L 933.144531 576.875 L 932.792969 576.992188 L 932.417969 577.109375 L 932.027344 577.167969 Z M 931.613281 577.226562 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 931.90625 585.707031 L 932.339844 585.667969 L 932.714844 585.570312 L 933.046875 585.414062 L 933.320312 585.179688 L 933.558594 584.882812 L 933.753906 584.550781 L 933.792969 584.394531 L 933.851562 584.234375 L 933.871094 584.078125 L 933.910156 583.902344 L 933.910156 583.746094 L 933.929688 583.589844 L 933.890625 583.136719 L 933.792969 582.722656 L 933.636719 582.351562 L 933.421875 581.996094 L 933.144531 581.683594 L 932.8125 581.429688 L 932.476562 581.230469 L 932.125 581.074219 L 931.75 580.957031 L 931.339844 580.859375 L 930.90625 580.800781 L 924.78125 580.800781 L 924.78125 579.171875 L 939.09375 579.171875 L 939.09375 580.800781 L 933.65625 580.800781 L 934.007812 581.09375 L 934.34375 581.410156 L 934.617188 581.722656 L 934.851562 582.039062 L 935.03125 582.351562 L 935.167969 582.683594 L 935.226562 582.882812 L 935.265625 583.097656 L 935.304688 583.332031 L 935.324219 583.570312 L 935.34375 583.824219 L 935.363281 584.097656 L 935.324219 584.667969 L 935.226562 585.199219 L 935.089844 585.667969 L 934.875 586.082031 L 934.597656 586.457031 L 934.285156 586.769531 L 934.027344 586.925781 L 933.773438 587.0625 L 933.5 587.179688 L 933.203125 587.261719 L 932.890625 587.320312 L 932.554688 587.339844 L 924.78125 587.339844 L 924.78125 585.707031 Z M 931.90625 585.707031 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 929.375 598.765625 L 929.375 591.1875 L 928.960938 591.1875 L 928.589844 591.226562 L 928.234375 591.285156 L 927.921875 591.363281 L 927.648438 591.460938 L 927.410156 591.578125 L 927.175781 591.738281 L 926.804688 591.992188 L 926.488281 592.285156 L 926.253906 592.640625 L 926.058594 593.011719 L 925.917969 593.425781 L 925.859375 593.878906 L 925.839844 593.917969 L 925.839844 594.210938 L 925.878906 594.839844 L 926.058594 595.390625 L 926.351562 595.878906 L 926.742188 596.292969 L 927.253906 596.625 L 927.902344 596.902344 L 927.902344 598.550781 L 927.253906 598.375 L 926.664062 598.15625 L 926.136719 597.863281 L 925.683594 597.511719 L 925.292969 597.078125 L 924.957031 596.605469 L 924.78125 596.234375 L 924.625 595.859375 L 924.503906 595.46875 L 924.40625 595.035156 L 924.347656 594.605469 L 924.328125 594.152344 L 924.386719 593.40625 L 924.523438 592.738281 L 924.742188 592.128906 L 925.035156 591.578125 L 925.429688 591.070312 L 925.917969 590.636719 L 926.410156 590.285156 L 926.980469 589.988281 L 927.609375 589.753906 L 928.277344 589.597656 L 929.003906 589.5 L 929.789062 589.480469 L 930.613281 589.5 L 931.398438 589.617188 L 932.125 589.8125 L 932.773438 590.066406 L 933.378906 590.402344 L 933.929688 590.832031 L 934.363281 591.265625 L 934.714844 591.757812 L 934.992188 592.304688 L 935.1875 592.875 L 935.304688 593.503906 L 935.363281 594.191406 L 935.324219 594.800781 L 935.226562 595.371094 L 935.070312 595.898438 L 934.832031 596.410156 L 934.539062 596.882812 L 934.1875 597.332031 L 933.949219 597.550781 L 933.714844 597.746094 L 933.480469 597.921875 L 933.203125 598.078125 L 932.929688 598.214844 L 932.652344 598.355469 L 932.242188 598.472656 L 931.789062 598.570312 L 931.28125 598.648438 L 930.691406 598.707031 L 930.0625 598.746094 Z M 930.710938 591.226562 L 930.710938 597 L 930.789062 597 L 930.828125 597.019531 L 931.242188 596.980469 L 931.652344 596.921875 L 932.027344 596.785156 L 932.378906 596.625 L 932.695312 596.410156 L 933.007812 596.15625 L 933.261719 595.859375 L 933.480469 595.566406 L 933.636719 595.230469 L 933.753906 594.898438 L 933.8125 594.542969 L 933.851562 594.171875 L 933.8125 593.699219 L 933.714844 593.269531 L 933.558594 592.875 L 933.339844 592.523438 L 933.066406 592.1875 L 932.734375 591.914062 L 932.4375 591.71875 L 932.144531 591.558594 L 931.808594 591.441406 L 931.457031 591.324219 L 931.082031 591.265625 Z M 930.710938 591.226562 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 931.613281 608.839844 L 931.613281 607.191406 L 932.105469 607.070312 L 932.554688 606.914062 L 932.949219 606.699219 L 933.261719 606.425781 L 933.5 606.089844 L 933.695312 605.71875 L 933.734375 605.558594 L 933.773438 605.402344 L 933.792969 605.246094 L 933.832031 605.089844 L 933.832031 604.914062 L 933.851562 604.753906 L 933.792969 604.246094 L 933.675781 603.792969 L 933.480469 603.378906 L 933.183594 603.007812 L 932.8125 602.695312 L 932.378906 602.4375 L 932.007812 602.261719 L 931.613281 602.144531 L 931.203125 602.027344 L 930.730469 601.96875 L 930.257812 601.90625 L 929.75 601.90625 L 929.003906 601.929688 L 928.355469 602.027344 L 927.765625 602.203125 L 927.253906 602.417969 L 926.804688 602.714844 L 926.429688 603.085938 L 926.234375 603.320312 L 926.097656 603.578125 L 925.976562 603.851562 L 925.898438 604.148438 L 925.839844 604.460938 L 925.839844 604.792969 L 925.898438 605.441406 L 926.117188 605.992188 L 926.449219 606.464844 L 926.941406 606.835938 L 927.550781 607.113281 L 928.316406 607.308594 L 928.316406 608.957031 L 927.570312 608.859375 L 926.921875 608.683594 L 926.332031 608.425781 L 925.820312 608.09375 L 925.371094 607.679688 L 924.996094 607.210938 L 924.78125 606.855469 L 924.625 606.484375 L 924.503906 606.089844 L 924.40625 605.660156 L 924.347656 605.207031 L 924.328125 604.753906 L 924.386719 604.066406 L 924.503906 603.441406 L 924.722656 602.851562 L 924.996094 602.320312 L 925.371094 601.828125 L 925.839844 601.398438 L 926.332031 601.023438 L 926.902344 600.710938 L 927.53125 600.496094 L 928.214844 600.316406 L 928.941406 600.21875 L 929.75 600.199219 L 930.59375 600.21875 L 931.378906 600.335938 L 932.105469 600.535156 L 932.773438 600.789062 L 933.378906 601.121094 L 933.929688 601.535156 L 934.363281 601.96875 L 934.714844 602.4375 L 934.992188 602.949219 L 935.1875 603.519531 L 935.304688 604.125 L 935.363281 604.773438 L 935.304688 605.5 L 935.1875 606.167969 L 934.953125 606.777344 L 934.65625 607.308594 L 934.246094 607.757812 L 933.773438 608.152344 L 933.460938 608.328125 L 933.144531 608.484375 L 932.792969 608.605469 L 932.417969 608.722656 L 932.027344 608.78125 Z M 931.613281 608.839844 "/>
+<path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(100%,97.254902%,70.19608%);fill-opacity:1;" d="M 939.09375 612.175781 L 930.710938 612.175781 L 935.070312 616.535156 L 935.070312 618.636719 L 931.515625 615.0625 L 924.78125 619.265625 L 924.78125 617.242188 L 930.355469 613.769531 L 928.785156 612.175781 L 924.78125 612.175781 L 924.78125 610.546875 L 939.09375 610.546875 Z M 939.09375 612.175781 "/>
+<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,97.254902%,70.19608%);stroke-opacity:1;stroke-miterlimit:10;" d="M 880 387 L 880 392 M 877 390 L 882 390 M 906 542 L 906 549 M 902 546 L 909 546 M 1013 542 L 1013 549 M 1009 546 L 1016 546 M 987 533 L 987 540 M 983 537 L 990 537 M 928 533 L 928 540 M 924 537 L 931 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_1.svg b/cells/maj3/sky130_fd_sc_hd__maj3_1.svg
index 25aa19c..47767d8 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_1.svg
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1287.5 666.5 L 1328.5 666.5 L 1328.5 844.5 L 1287.5 844.5 Z M 664.5 729.5 L 705.5 729.5 L 705.5 844.5 L 664.5 844.5 Z M 1091.5 729.5 L 1132.5 729.5 L 1132.5 844.5 L 1091.5 844.5 Z M 992.5 729.5 L 1034.5 729.5 L 1034.5 844.5 L 992.5 844.5 Z M 878.5 729.5 L 919.5 729.5 L 919.5 844.5 L 878.5 844.5 Z M 779.5 729.5 L 820.5 729.5 L 820.5 844.5 L 779.5 844.5 Z M 566.5 729.5 L 607.5 729.5 L 607.5 844.5 L 566.5 844.5 Z M 566.5 729.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 327.5 L 607.5 327.5 L 607.5 442.5 L 566.5 442.5 Z M 664.5 327.5 L 705.5 327.5 L 705.5 442.5 L 664.5 442.5 Z M 1091.5 327.5 L 1132.5 327.5 L 1132.5 442.5 L 1091.5 442.5 Z M 992.5 327.5 L 1034.5 327.5 L 1034.5 442.5 L 992.5 442.5 Z M 878.5 327.5 L 919.5 327.5 L 919.5 442.5 L 878.5 442.5 Z M 779.5 327.5 L 820.5 327.5 L 820.5 442.5 L 779.5 442.5 Z M 1287.5 228.5 L 1328.5 228.5 L 1328.5 502.5 L 1287.5 502.5 Z M 1287.5 228.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 625 799 L 671 799 M 625 752 L 671 752 M 625 752 L 625 799 M 671 752 L 671 799 M 625 706 L 671 706 M 625 659 L 671 659 M 625 659 L 625 706 M 671 659 L 671 706 M 625 613 L 671 613 M 625 566 L 671 566 M 625 566 L 625 613 M 671 566 L 671 613 M 876 613 L 923 613 M 876 566 L 923 566 M 876 566 L 876 613 M 923 566 L 923 613 M 1128 427 L 1174 427 M 1128 380 L 1174 380 M 1128 380 L 1128 427 M 1174 380 L 1174 427 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_2.svg b/cells/maj3/sky130_fd_sc_hd__maj3_2.svg
index 142e8f7..2c467ea 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_2.svg
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1261.5 666.5 L 1302.5 666.5 L 1302.5 844.5 L 1261.5 844.5 Z M 629.5 729.5 L 670.5 729.5 L 670.5 844.5 L 629.5 844.5 Z M 530.5 729.5 L 571.5 729.5 L 571.5 844.5 L 530.5 844.5 Z M 1055.5 729.5 L 1096.5 729.5 L 1096.5 844.5 L 1055.5 844.5 Z M 957.5 729.5 L 998.5 729.5 L 998.5 844.5 L 957.5 844.5 Z M 842.5 729.5 L 883.5 729.5 L 883.5 844.5 L 842.5 844.5 Z M 744.5 729.5 L 785.5 729.5 L 785.5 844.5 L 744.5 844.5 Z M 1375.5 666.5 L 1416.5 666.5 L 1416.5 844.5 L 1375.5 844.5 Z M 1375.5 666.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1055.5 228.5 L 1096.5 228.5 L 1096.5 403.5 L 1055.5 403.5 Z M 957.5 228.5 L 998.5 228.5 L 998.5 403.5 L 957.5 403.5 Z M 629.5 228.5 L 670.5 228.5 L 670.5 403.5 L 629.5 403.5 Z M 530.5 228.5 L 571.5 228.5 L 571.5 403.5 L 530.5 403.5 Z M 842.5 228.5 L 883.5 228.5 L 883.5 403.5 L 842.5 403.5 Z M 744.5 228.5 L 785.5 228.5 L 785.5 403.5 L 744.5 403.5 Z M 1261.5 228.5 L 1302.5 228.5 L 1302.5 502.5 L 1261.5 502.5 Z M 1375.5 228.5 L 1416.5 228.5 L 1416.5 502.5 L 1375.5 502.5 Z M 1375.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image286" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <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 1314 334 L 1360 334 M 1314 287 L 1360 287 M 1314 287 L 1314 334 M 1360 287 L 1360 334 " 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 1314 334 L 1360 334 M 1314 287 L 1360 287 M 1360 334 L 1360 287 M 1314 334 L 1314 287 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 560 520 L 607 520 M 560 473 L 607 473 M 560 473 L 560 520 M 607 473 L 607 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hd__maj3_4.svg b/cells/maj3/sky130_fd_sc_hd__maj3_4.svg
index 35ad4df..1d695d7 100644
--- a/cells/maj3/sky130_fd_sc_hd__maj3_4.svg
+++ b/cells/maj3/sky130_fd_sc_hd__maj3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image315" 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="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 306.5 885.5 L 352.5 885.5 L 352.5 931.5 L 306.5 931.5 Z M 306.5 885.5 "/>
 </clipPath>
 <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="#image315"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1503.5 666.5 L 1544.5 666.5 L 1544.5 844.5 L 1503.5 844.5 Z M 433.5 666.5 L 474.5 666.5 L 474.5 844.5 L 433.5 844.5 Z M 541.5 666.5 L 582.5 666.5 L 582.5 844.5 L 541.5 844.5 Z M 656.5 666.5 L 697.5 666.5 L 697.5 844.5 L 656.5 844.5 Z M 771.5 666.5 L 812.5 666.5 L 812.5 844.5 L 771.5 844.5 Z M 886.5 666.5 L 927.5 666.5 L 927.5 844.5 L 886.5 844.5 Z M 984.5 666.5 L 1025.5 666.5 L 1025.5 844.5 L 984.5 844.5 Z M 1158.5 666.5 L 1199.5 666.5 L 1199.5 844.5 L 1158.5 844.5 Z M 1273.5 666.5 L 1314.5 666.5 L 1314.5 844.5 L 1273.5 844.5 Z M 1388.5 666.5 L 1429.5 666.5 L 1429.5 844.5 L 1388.5 844.5 Z M 1388.5 666.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image316"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1503.5 228.5 L 1544.5 228.5 L 1544.5 502.5 L 1503.5 502.5 Z M 433.5 228.5 L 474.5 228.5 L 474.5 502.5 L 433.5 502.5 Z M 541.5 228.5 L 582.5 228.5 L 582.5 502.5 L 541.5 502.5 Z M 656.5 228.5 L 697.5 228.5 L 697.5 502.5 L 656.5 502.5 Z M 771.5 228.5 L 812.5 228.5 L 812.5 502.5 L 771.5 502.5 Z M 886.5 228.5 L 927.5 228.5 L 927.5 502.5 L 886.5 502.5 Z M 984.5 228.5 L 1025.5 228.5 L 1025.5 502.5 L 984.5 502.5 Z M 1158.5 228.5 L 1199.5 228.5 L 1199.5 502.5 L 1158.5 502.5 Z M 1273.5 228.5 L 1314.5 228.5 L 1314.5 502.5 L 1273.5 502.5 Z M 1388.5 228.5 L 1429.5 228.5 L 1429.5 502.5 L 1388.5 502.5 Z M 1388.5 228.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 306 938 L 352 938 M 306 892 L 352 892 M 306 892 L 306 938 M 352 892 L 352 938 " 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 306 938 L 352 938 M 306 892 L 352 892 M 352 938 L 352 892 M 306 938 L 306 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_1.svg b/cells/mux2/sky130_fd_sc_hd__mux2_1.svg
index 826907d..1b7f6a9 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_1.svg
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 510.5 885.5 L 556.5 885.5 L 556.5 931.5 L 510.5 931.5 Z M 510.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 1315.5 729.5 L 1356.5 729.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1085.5 729.5 L 1127.5 729.5 L 1127.5 844.5 L 1085.5 844.5 Z M 954.5 729.5 L 995.5 729.5 L 995.5 844.5 L 954.5 844.5 Z M 783.5 729.5 L 824.5 729.5 L 824.5 844.5 L 783.5 844.5 Z M 652.5 729.5 L 693.5 729.5 L 693.5 844.5 L 652.5 844.5 Z M 652.5 729.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 652.5 282.5 L 693.5 282.5 L 693.5 397.5 L 652.5 397.5 Z M 1315.5 282.5 L 1356.5 282.5 L 1356.5 397.5 L 1315.5 397.5 Z M 1184.5 282.5 L 1225.5 282.5 L 1225.5 397.5 L 1184.5 397.5 Z M 1085.5 282.5 L 1127.5 282.5 L 1127.5 397.5 L 1085.5 397.5 Z M 793.5 282.5 L 834.5 282.5 L 834.5 397.5 L 793.5 397.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 503.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <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 194 L 556 194 M 510 148 L 556 148 M 510 148 L 510 194 M 556 148 L 556 194 " 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 194 L 556 194 M 510 148 L 556 148 M 556 194 L 556 148 M 510 194 L 510 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_2.svg b/cells/mux2/sky130_fd_sc_hd__mux2_2.svg
index 42a2806..8b70c81 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_2.svg
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 1375.5 729.5 L 1416.5 729.5 L 1416.5 844.5 L 1375.5 844.5 Z M 1261.5 729.5 L 1302.5 729.5 L 1302.5 844.5 L 1261.5 844.5 Z M 1144.5 729.5 L 1185.5 729.5 L 1185.5 844.5 L 1144.5 844.5 Z M 878.5 729.5 L 919.5 729.5 L 919.5 844.5 L 878.5 844.5 Z M 748.5 729.5 L 789.5 729.5 L 789.5 844.5 L 748.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 618.5 666.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1375.5 228.5 L 1416.5 228.5 L 1416.5 403.5 L 1375.5 403.5 Z M 1261.5 228.5 L 1302.5 228.5 L 1302.5 403.5 L 1261.5 403.5 Z M 1009.5 228.5 L 1050.5 228.5 L 1050.5 403.5 L 1009.5 403.5 Z M 772.5 228.5 L 813.5 228.5 L 813.5 403.5 L 772.5 403.5 Z M 1162.5 228.5 L 1203.5 228.5 L 1203.5 403.5 L 1162.5 403.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 618.5 228.5 "/>
 </clipPath>
-<image id="image318" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_4.svg b/cells/mux2/sky130_fd_sc_hd__mux2_4.svg
index 8148f24..e741216 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_4.svg
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1549.5 662.5 L 1589.5 662.5 L 1589.5 835.5 L 1549.5 835.5 Z M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 460.5 662.5 L 500.5 662.5 L 500.5 835.5 L 460.5 835.5 Z M 713.5 662.5 L 752.5 662.5 L 752.5 835.5 L 713.5 835.5 Z M 838.5 662.5 L 877.5 662.5 L 877.5 835.5 L 838.5 835.5 Z M 1102.5 662.5 L 1142.5 662.5 L 1142.5 835.5 L 1102.5 835.5 Z M 1214.5 662.5 L 1254.5 662.5 L 1254.5 835.5 L 1214.5 835.5 Z M 1326.5 662.5 L 1365.5 662.5 L 1365.5 835.5 L 1326.5 835.5 Z M 1437.5 662.5 L 1477.5 662.5 L 1477.5 835.5 L 1437.5 835.5 Z M 1437.5 662.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1549.5 237.5 L 1589.5 237.5 L 1589.5 503.5 L 1549.5 503.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 457.5 237.5 L 497.5 237.5 L 497.5 503.5 L 457.5 503.5 Z M 713.5 237.5 L 752.5 237.5 L 752.5 503.5 L 713.5 503.5 Z M 838.5 237.5 L 877.5 237.5 L 877.5 503.5 L 838.5 503.5 Z M 1102.5 237.5 L 1142.5 237.5 L 1142.5 503.5 L 1102.5 503.5 Z M 1214.5 237.5 L 1254.5 237.5 L 1254.5 503.5 L 1214.5 503.5 Z M 1326.5 237.5 L 1365.5 237.5 L 1365.5 503.5 L 1326.5 503.5 Z M 1437.5 237.5 L 1477.5 237.5 L 1477.5 503.5 L 1437.5 503.5 Z M 1437.5 237.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 266 204 L 311 204 M 266 159 L 311 159 M 266 159 L 266 204 M 311 159 L 311 204 " 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 266 204 L 311 204 M 266 159 L 311 159 M 311 204 L 311 159 M 266 204 L 266 159 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hd__mux2_8.svg b/cells/mux2/sky130_fd_sc_hd__mux2_8.svg
index 1f1e7f1..bda47b2 100644
--- a/cells/mux2/sky130_fd_sc_hd__mux2_8.svg
+++ b/cells/mux2/sky130_fd_sc_hd__mux2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" 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="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1629.5 609.5 L 1652.5 609.5 L 1652.5 710.5 L 1629.5 710.5 Z M 799.5 610.5 L 823.5 610.5 L 823.5 710.5 L 799.5 710.5 Z M 869.5 610.5 L 892.5 610.5 L 892.5 710.5 L 869.5 710.5 Z M 934.5 610.5 L 958.5 610.5 L 958.5 710.5 L 934.5 710.5 Z M 1122.5 610.5 L 1146.5 610.5 L 1146.5 710.5 L 1122.5 710.5 Z M 1198.5 610.5 L 1221.5 610.5 L 1221.5 710.5 L 1198.5 710.5 Z M 1297.5 610.5 L 1321.5 610.5 L 1321.5 710.5 L 1297.5 710.5 Z M 1363.5 610.5 L 1386.5 610.5 L 1386.5 710.5 L 1363.5 710.5 Z M 1551.5 610.5 L 1574.5 610.5 L 1574.5 710.5 L 1551.5 710.5 Z M 265.5 609.5 L 289.5 609.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 609.5 L 354.5 609.5 L 354.5 710.5 L 331.5 710.5 Z M 397.5 609.5 L 420.5 609.5 L 420.5 710.5 L 397.5 710.5 Z M 462.5 609.5 L 486.5 609.5 L 486.5 710.5 L 462.5 710.5 Z M 528.5 609.5 L 551.5 609.5 L 551.5 710.5 L 528.5 710.5 Z M 594.5 609.5 L 617.5 609.5 L 617.5 710.5 L 594.5 710.5 Z M 659.5 609.5 L 683.5 609.5 L 683.5 710.5 L 659.5 710.5 Z M 725.5 609.5 L 748.5 609.5 L 748.5 710.5 L 725.5 710.5 Z M 725.5 609.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1629.5 358.5 L 1652.5 358.5 L 1652.5 515.5 L 1629.5 515.5 Z M 265.5 358.5 L 289.5 358.5 L 289.5 515.5 L 265.5 515.5 Z M 331.5 358.5 L 354.5 358.5 L 354.5 515.5 L 331.5 515.5 Z M 397.5 358.5 L 420.5 358.5 L 420.5 515.5 L 397.5 515.5 Z M 462.5 358.5 L 486.5 358.5 L 486.5 515.5 L 462.5 515.5 Z M 528.5 358.5 L 551.5 358.5 L 551.5 515.5 L 528.5 515.5 Z M 594.5 358.5 L 617.5 358.5 L 617.5 515.5 L 594.5 515.5 Z M 659.5 358.5 L 683.5 358.5 L 683.5 515.5 L 659.5 515.5 Z M 725.5 358.5 L 748.5 358.5 L 748.5 515.5 L 725.5 515.5 Z M 799.5 358.5 L 823.5 358.5 L 823.5 515.5 L 799.5 515.5 Z M 991.5 358.5 L 1014.5 358.5 L 1014.5 515.5 L 991.5 515.5 Z M 1056.5 358.5 L 1080.5 358.5 L 1080.5 515.5 L 1056.5 515.5 Z M 1122.5 358.5 L 1146.5 358.5 L 1146.5 515.5 L 1122.5 515.5 Z M 1198.5 358.5 L 1221.5 358.5 L 1221.5 515.5 L 1198.5 515.5 Z M 1419.5 358.5 L 1443.5 358.5 L 1443.5 515.5 L 1419.5 515.5 Z M 1485.5 358.5 L 1508.5 358.5 L 1508.5 515.5 L 1485.5 515.5 Z M 1551.5 358.5 L 1574.5 358.5 L 1574.5 515.5 L 1551.5 515.5 Z M 1551.5 358.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 1090.5 494.5 L 1117.5 494.5 L 1117.5 521.5 L 1090.5 521.5 Z M 1664.5 494.5 L 1690.5 494.5 L 1690.5 521.5 L 1664.5 521.5 Z M 1448.5 548.5 L 1475.5 548.5 L 1475.5 552.5 L 1448.5 552.5 Z M 874.5 548.5 L 901.5 548.5 L 901.5 552.5 L 874.5 552.5 Z M 1448.5 552.5 L 1475.5 552.5 L 1475.5 574.5 L 1448.5 574.5 Z M 874.5 552.5 L 901.5 552.5 L 901.5 574.5 L 874.5 574.5 Z M 1376.5 601.5 L 1403.5 601.5 L 1403.5 627.5 L 1376.5 627.5 Z M 946.5 601.5 L 973.5 601.5 L 973.5 627.5 L 946.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image287" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 299 531 L 325 531 M 299 505 L 325 505 M 299 505 L 299 531 M 325 505 L 325 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 299 531 L 325 531 M 299 505 L 325 505 M 325 531 L 325 505 M 299 531 L 299 505 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.svg b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.svg
index 289e68b..ee879e3 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_1.svg
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 681.5 666.5 L 722.5 666.5 L 722.5 844.5 L 681.5 844.5 Z M 943.5 666.5 L 984.5 666.5 L 984.5 844.5 L 943.5 844.5 Z M 1058.5 666.5 L 1099.5 666.5 L 1099.5 844.5 L 1058.5 844.5 Z M 1058.5 666.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 571.5 228.5 L 612.5 228.5 L 612.5 502.5 L 571.5 502.5 Z M 696.5 228.5 L 737.5 228.5 L 737.5 502.5 L 696.5 502.5 Z M 845.5 228.5 L 886.5 228.5 L 886.5 502.5 L 845.5 502.5 Z M 1050.5 228.5 L 1091.5 228.5 L 1091.5 502.5 L 1050.5 502.5 Z M 1050.5 228.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 623 613 L 670 613 M 623 566 L 670 566 M 623 566 L 623 613 M 670 566 L 670 613 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.svg b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.svg
index 7a0c8f5..3c5275b 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_2.svg
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1449.5 666.5 L 1490.5 666.5 L 1490.5 844.5 L 1449.5 844.5 Z M 376.5 666.5 L 417.5 666.5 L 417.5 844.5 L 376.5 844.5 Z M 491.5 666.5 L 532.5 666.5 L 532.5 844.5 L 491.5 844.5 Z M 605.5 666.5 L 646.5 666.5 L 646.5 844.5 L 605.5 844.5 Z M 720.5 666.5 L 761.5 666.5 L 761.5 844.5 L 720.5 844.5 Z M 835.5 666.5 L 876.5 666.5 L 876.5 844.5 L 835.5 844.5 Z M 1092.5 666.5 L 1133.5 666.5 L 1133.5 844.5 L 1092.5 844.5 Z M 1207.5 666.5 L 1248.5 666.5 L 1248.5 844.5 L 1207.5 844.5 Z M 1333.5 666.5 L 1374.5 666.5 L 1374.5 844.5 L 1333.5 844.5 Z M 1333.5 666.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1449.5 228.5 L 1490.5 228.5 L 1490.5 502.5 L 1449.5 502.5 Z M 376.5 228.5 L 417.5 228.5 L 417.5 502.5 L 376.5 502.5 Z M 491.5 228.5 L 532.5 228.5 L 532.5 502.5 L 491.5 502.5 Z M 605.5 228.5 L 646.5 228.5 L 646.5 502.5 L 605.5 502.5 Z M 720.5 228.5 L 761.5 228.5 L 761.5 502.5 L 720.5 502.5 Z M 835.5 228.5 L 876.5 228.5 L 876.5 502.5 L 835.5 502.5 Z M 1092.5 228.5 L 1133.5 228.5 L 1133.5 502.5 L 1092.5 502.5 Z M 1207.5 228.5 L 1248.5 228.5 L 1248.5 502.5 L 1207.5 502.5 Z M 1333.5 228.5 L 1374.5 228.5 L 1374.5 502.5 L 1333.5 502.5 Z M 1333.5 228.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 560.5 652.5 L 607.5 652.5 L 607.5 682.5 L 560.5 682.5 Z M 560.5 682.5 L 607.5 682.5 L 607.5 699.5 L 560.5 699.5 Z M 1321.5 652.5 L 1367.5 652.5 L 1367.5 699.5 L 1321.5 699.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,5 @@
 <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 309 194 L 355 194 M 309 148 L 355 148 M 309 148 L 309 194 M 355 148 L 355 194 " 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 309 194 L 355 194 M 309 148 L 355 148 M 355 194 L 355 148 M 309 194 L 309 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 434 427 L 481 427 M 434 380 L 481 380 M 434 380 L 434 427 M 481 380 L 481 427 M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.svg b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.svg
index e7c7f28..edd17ae 100644
--- a/cells/mux2i/sky130_fd_sc_hd__mux2i_4.svg
+++ b/cells/mux2i/sky130_fd_sc_hd__mux2i_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1611.5 621.5 L 1638.5 621.5 L 1638.5 739.5 L 1611.5 739.5 Z M 281.5 621.5 L 308.5 621.5 L 308.5 739.5 L 281.5 739.5 Z M 357.5 621.5 L 384.5 621.5 L 384.5 739.5 L 357.5 739.5 Z M 433.5 621.5 L 460.5 621.5 L 460.5 739.5 L 433.5 739.5 Z M 509.5 621.5 L 536.5 621.5 L 536.5 739.5 L 509.5 739.5 Z M 585.5 621.5 L 612.5 621.5 L 612.5 739.5 L 585.5 739.5 Z M 661.5 621.5 L 688.5 621.5 L 688.5 739.5 L 661.5 739.5 Z M 737.5 621.5 L 764.5 621.5 L 764.5 739.5 L 737.5 739.5 Z M 813.5 621.5 L 841.5 621.5 L 841.5 739.5 L 813.5 739.5 Z M 984.5 621.5 L 1011.5 621.5 L 1011.5 739.5 L 984.5 739.5 Z M 1060.5 621.5 L 1087.5 621.5 L 1087.5 739.5 L 1060.5 739.5 Z M 1136.5 621.5 L 1163.5 621.5 L 1163.5 739.5 L 1136.5 739.5 Z M 1212.5 621.5 L 1239.5 621.5 L 1239.5 739.5 L 1212.5 739.5 Z M 1288.5 621.5 L 1315.5 621.5 L 1315.5 739.5 L 1288.5 739.5 Z M 1364.5 621.5 L 1391.5 621.5 L 1391.5 739.5 L 1364.5 739.5 Z M 1440.5 621.5 L 1468.5 621.5 L 1468.5 739.5 L 1440.5 739.5 Z M 1526.5 621.5 L 1554.5 621.5 L 1554.5 739.5 L 1526.5 739.5 Z M 1526.5 621.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1611.5 331.5 L 1638.5 331.5 L 1638.5 512.5 L 1611.5 512.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 512.5 L 281.5 512.5 Z M 357.5 331.5 L 384.5 331.5 L 384.5 512.5 L 357.5 512.5 Z M 433.5 331.5 L 460.5 331.5 L 460.5 512.5 L 433.5 512.5 Z M 509.5 331.5 L 536.5 331.5 L 536.5 512.5 L 509.5 512.5 Z M 585.5 331.5 L 612.5 331.5 L 612.5 512.5 L 585.5 512.5 Z M 661.5 331.5 L 688.5 331.5 L 688.5 512.5 L 661.5 512.5 Z M 737.5 331.5 L 764.5 331.5 L 764.5 512.5 L 737.5 512.5 Z M 813.5 331.5 L 841.5 331.5 L 841.5 512.5 L 813.5 512.5 Z M 984.5 331.5 L 1011.5 331.5 L 1011.5 512.5 L 984.5 512.5 Z M 1060.5 331.5 L 1087.5 331.5 L 1087.5 512.5 L 1060.5 512.5 Z M 1136.5 331.5 L 1163.5 331.5 L 1163.5 512.5 L 1136.5 512.5 Z M 1212.5 331.5 L 1239.5 331.5 L 1239.5 512.5 L 1212.5 512.5 Z M 1288.5 331.5 L 1315.5 331.5 L 1315.5 512.5 L 1288.5 512.5 Z M 1364.5 331.5 L 1391.5 331.5 L 1391.5 512.5 L 1364.5 512.5 Z M 1440.5 331.5 L 1468.5 331.5 L 1468.5 512.5 L 1440.5 512.5 Z M 1526.5 331.5 L 1554.5 331.5 L 1554.5 512.5 L 1526.5 512.5 Z M 1526.5 331.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 486.5 612.5 L 517.5 612.5 L 517.5 632.5 L 486.5 632.5 Z M 486.5 632.5 L 517.5 632.5 L 517.5 643.5 L 486.5 643.5 Z M 1323.5 612.5 L 1354.5 612.5 L 1354.5 643.5 L 1323.5 643.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface330">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 236 806 L 267 806 M 236 775 L 267 775 M 236 775 L 236 806 M 267 775 L 267 806 " 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 236 806 L 267 806 M 236 775 L 267 775 M 267 806 L 267 775 M 236 806 L 236 775 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_1.svg b/cells/mux4/sky130_fd_sc_hd__mux4_1.svg
index 6562458..8ff9f3a 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_1.svg
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" 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="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1457.5 605.5 L 1480.5 605.5 L 1480.5 671.5 L 1457.5 671.5 Z M 766.5 605.5 L 790.5 605.5 L 790.5 671.5 L 766.5 671.5 Z M 832.5 605.5 L 855.5 605.5 L 855.5 671.5 L 832.5 671.5 Z M 619.5 611.5 L 643.5 611.5 L 643.5 677.5 L 619.5 677.5 Z M 472.5 618.5 L 496.5 618.5 L 496.5 684.5 L 472.5 684.5 Z M 1043.5 645.5 L 1067.5 645.5 L 1067.5 710.5 L 1043.5 710.5 Z M 977.5 645.5 L 1001.5 645.5 L 1001.5 710.5 L 977.5 710.5 Z M 397.5 645.5 L 420.5 645.5 L 420.5 710.5 L 397.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 1629.5 609.5 L 1652.5 609.5 L 1652.5 710.5 L 1629.5 710.5 Z M 1190.5 645.5 L 1214.5 645.5 L 1214.5 710.5 L 1190.5 710.5 Z M 1337.5 645.5 L 1361.5 645.5 L 1361.5 710.5 L 1337.5 710.5 Z M 1337.5 645.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 265.5 358.5 L 289.5 358.5 L 289.5 424.5 L 265.5 424.5 Z M 331.5 358.5 L 354.5 358.5 L 354.5 424.5 L 331.5 424.5 Z M 1189.5 358.5 L 1212.5 358.5 L 1212.5 424.5 L 1189.5 424.5 Z M 976.5 358.5 L 999.5 358.5 L 999.5 424.5 L 976.5 424.5 Z M 691.5 358.5 L 714.5 358.5 L 714.5 424.5 L 691.5 424.5 Z M 1336.5 358.5 L 1359.5 358.5 L 1359.5 424.5 L 1336.5 424.5 Z M 1042.5 358.5 L 1065.5 358.5 L 1065.5 424.5 L 1042.5 424.5 Z M 1411.5 395.5 L 1435.5 395.5 L 1435.5 461.5 L 1411.5 461.5 Z M 544.5 398.5 L 567.5 398.5 L 567.5 463.5 L 544.5 463.5 Z M 478.5 398.5 L 501.5 398.5 L 501.5 463.5 L 478.5 463.5 Z M 836.5 398.5 L 859.5 398.5 L 859.5 463.5 L 836.5 463.5 Z M 902.5 398.5 L 925.5 398.5 L 925.5 463.5 L 902.5 463.5 Z M 1629.5 358.5 L 1652.5 358.5 L 1652.5 515.5 L 1629.5 515.5 Z M 1629.5 358.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 880.5 441.5 L 906.5 441.5 L 906.5 468.5 L 880.5 468.5 Z M 1385.5 441.5 L 1411.5 441.5 L 1411.5 468.5 L 1385.5 468.5 Z M 874.5 548.5 L 901.5 548.5 L 901.5 549.5 L 874.5 549.5 Z M 874.5 549.5 L 901.5 549.5 L 901.5 574.5 L 874.5 574.5 Z M 1241.5 548.5 L 1267.5 548.5 L 1267.5 574.5 L 1241.5 574.5 Z M 1529.5 548.5 L 1555.5 548.5 L 1555.5 574.5 L 1529.5 574.5 Z M 587.5 548.5 L 613.5 548.5 L 613.5 574.5 L 587.5 574.5 Z M 1306.5 601.5 L 1332.5 601.5 L 1332.5 627.5 L 1306.5 627.5 Z M 1450.5 601.5 L 1476.5 601.5 L 1476.5 627.5 L 1450.5 627.5 Z M 443.5 601.5 L 469.5 601.5 L 469.5 627.5 L 443.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -178,6 +178,5 @@
 <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 226 771 L 253 771 M 226 744 L 253 744 M 226 744 L 226 771 M 253 744 L 253 771 " 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 226 771 L 253 771 M 226 744 L 253 744 M 253 771 L 253 744 M 226 771 L 226 744 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 730 638 L 757 638 M 730 611 L 757 611 M 730 611 L 730 638 M 757 611 L 757 638 M 954 585 L 981 585 M 954 558 L 981 558 M 954 558 L 954 585 M 981 558 L 981 585 M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_2.svg b/cells/mux4/sky130_fd_sc_hd__mux4_2.svg
index 7471939..4df8d50 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_2.svg
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image377" 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="#image347"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 235.5 766.5 "/>
 </clipPath>
 <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="#image377"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1596.5 621.5 L 1623.5 621.5 L 1623.5 739.5 L 1596.5 739.5 Z M 443.5 673.5 L 470.5 673.5 L 470.5 739.5 L 443.5 739.5 Z M 1243.5 673.5 L 1270.5 673.5 L 1270.5 739.5 L 1243.5 739.5 Z M 542.5 673.5 L 569.5 673.5 L 569.5 739.5 L 542.5 739.5 Z M 1342.5 673.5 L 1370.5 673.5 L 1370.5 739.5 L 1342.5 739.5 Z M 357.5 662.5 L 384.5 662.5 L 384.5 739.5 L 357.5 739.5 Z M 1146.5 662.5 L 1173.5 662.5 L 1173.5 739.5 L 1146.5 739.5 Z M 976.5 662.5 L 1003.5 662.5 L 1003.5 739.5 L 976.5 739.5 Z M 899.5 662.5 L 926.5 662.5 L 926.5 739.5 L 899.5 739.5 Z M 726.5 662.5 L 754.5 662.5 L 754.5 739.5 L 726.5 739.5 Z M 629.5 662.5 L 656.5 662.5 L 656.5 739.5 L 629.5 739.5 Z M 1429.5 662.5 L 1456.5 662.5 L 1456.5 739.5 L 1429.5 739.5 Z M 281.5 662.5 L 308.5 662.5 L 308.5 739.5 L 281.5 739.5 Z M 1520.5 621.5 L 1547.5 621.5 L 1547.5 739.5 L 1520.5 739.5 Z M 1520.5 621.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 443.5 331.5 L 470.5 331.5 L 470.5 407.5 L 443.5 407.5 Z M 519.5 331.5 L 546.5 331.5 L 546.5 407.5 L 519.5 407.5 Z M 1265.5 331.5 L 1292.5 331.5 L 1292.5 407.5 L 1265.5 407.5 Z M 1341.5 331.5 L 1368.5 331.5 L 1368.5 407.5 L 1341.5 407.5 Z M 357.5 331.5 L 384.5 331.5 L 384.5 447.5 L 357.5 447.5 Z M 1432.5 331.5 L 1459.5 331.5 L 1459.5 447.5 L 1432.5 447.5 Z M 1142.5 331.5 L 1169.5 331.5 L 1169.5 447.5 L 1142.5 447.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 447.5 L 281.5 447.5 Z M 649.5 353.5 L 677.5 353.5 L 677.5 469.5 L 649.5 469.5 Z M 726.5 353.5 L 753.5 353.5 L 753.5 469.5 L 726.5 469.5 Z M 972.5 397.5 L 999.5 397.5 L 999.5 495.5 L 972.5 495.5 Z M 896.5 397.5 L 923.5 397.5 L 923.5 495.5 L 896.5 495.5 Z M 1520.5 331.5 L 1547.5 331.5 L 1547.5 512.5 L 1520.5 512.5 Z M 1596.5 331.5 L 1623.5 331.5 L 1623.5 512.5 L 1596.5 512.5 Z M 1596.5 331.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 569.5 365.5 L 600.5 365.5 L 600.5 396.5 L 569.5 396.5 Z M 819.5 365.5 L 850.5 365.5 L 850.5 396.5 L 819.5 396.5 Z M 1402.5 365.5 L 1433.5 365.5 L 1433.5 396.5 L 1402.5 396.5 Z M 986.5 365.5 L 1016.5 365.5 L 1016.5 396.5 L 986.5 396.5 Z M 1236.5 427.5 L 1266.5 427.5 L 1266.5 450.5 L 1236.5 450.5 Z M 1236.5 450.5 L 1266.5 450.5 L 1266.5 458.5 L 1236.5 458.5 Z M 485.5 427.5 L 516.5 427.5 L 516.5 458.5 L 485.5 458.5 Z M 402.5 489.5 L 433.5 489.5 L 433.5 503.5 L 402.5 503.5 Z M 402.5 503.5 L 433.5 503.5 L 433.5 519.5 L 402.5 519.5 Z M 235.5 489.5 L 266.5 489.5 L 266.5 519.5 L 235.5 519.5 Z M 1319.5 489.5 L 1350.5 489.5 L 1350.5 519.5 L 1319.5 519.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface344">
+<g id="surface374">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -191,6 +191,5 @@
 <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 1569 714 L 1600 714 M 1569 683 L 1600 683 M 1569 683 L 1569 714 M 1600 683 L 1600 714 " 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 1569 714 L 1600 714 M 1569 683 L 1600 683 M 1600 714 L 1600 683 M 1569 714 L 1569 683 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hd__mux4_4.svg b/cells/mux4/sky130_fd_sc_hd__mux4_4.svg
index 0847267..2b0b75c 100644
--- a/cells/mux4/sky130_fd_sc_hd__mux4_4.svg
+++ b/cells/mux4/sky130_fd_sc_hd__mux4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" 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="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 230.5 743.5 L 258.5 743.5 L 258.5 771.5 L 230.5 771.5 Z M 230.5 743.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1392.5 612.5 L 1416.5 612.5 L 1416.5 719.5 L 1392.5 719.5 Z M 507.5 660.5 L 531.5 660.5 L 531.5 719.5 L 507.5 719.5 Z M 417.5 660.5 L 441.5 660.5 L 441.5 719.5 L 417.5 719.5 Z M 1141.5 660.5 L 1166.5 660.5 L 1166.5 719.5 L 1141.5 719.5 Z M 1231.5 660.5 L 1256.5 660.5 L 1256.5 719.5 L 1231.5 719.5 Z M 1309.5 650.5 L 1334.5 650.5 L 1334.5 719.5 L 1309.5 719.5 Z M 270.5 650.5 L 295.5 650.5 L 295.5 719.5 L 270.5 719.5 Z M 339.5 650.5 L 364.5 650.5 L 364.5 719.5 L 339.5 719.5 Z M 1053.5 650.5 L 1078.5 650.5 L 1078.5 719.5 L 1053.5 719.5 Z M 899.5 650.5 L 924.5 650.5 L 924.5 719.5 L 899.5 719.5 Z M 830.5 650.5 L 854.5 650.5 L 854.5 719.5 L 830.5 719.5 Z M 674.5 650.5 L 699.5 650.5 L 699.5 719.5 L 674.5 719.5 Z M 586.5 650.5 L 610.5 650.5 L 610.5 719.5 L 586.5 719.5 Z M 1611.5 612.5 L 1636.5 612.5 L 1636.5 719.5 L 1611.5 719.5 Z M 1542.5 612.5 L 1567.5 612.5 L 1567.5 719.5 L 1542.5 719.5 Z M 1460.5 612.5 L 1485.5 612.5 L 1485.5 719.5 L 1460.5 719.5 Z M 1460.5 612.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 418.5 350.5 L 442.5 350.5 L 442.5 419.5 L 418.5 419.5 Z M 486.5 350.5 L 511.5 350.5 L 511.5 419.5 L 486.5 419.5 Z M 1161.5 350.5 L 1185.5 350.5 L 1185.5 419.5 L 1161.5 419.5 Z M 1229.5 350.5 L 1254.5 350.5 L 1254.5 419.5 L 1229.5 419.5 Z M 339.5 350.5 L 364.5 350.5 L 364.5 455.5 L 339.5 455.5 Z M 1312.5 350.5 L 1337.5 350.5 L 1337.5 455.5 L 1312.5 455.5 Z M 1050.5 350.5 L 1075.5 350.5 L 1075.5 455.5 L 1050.5 455.5 Z M 270.5 350.5 L 295.5 350.5 L 295.5 455.5 L 270.5 455.5 Z M 604.5 370.5 L 629.5 370.5 L 629.5 475.5 L 604.5 475.5 Z M 673.5 370.5 L 698.5 370.5 L 698.5 475.5 L 673.5 475.5 Z M 896.5 410.5 L 921.5 410.5 L 921.5 498.5 L 896.5 498.5 Z M 827.5 410.5 L 852.5 410.5 L 852.5 498.5 L 827.5 498.5 Z M 1460.5 350.5 L 1485.5 350.5 L 1485.5 514.5 L 1460.5 514.5 Z M 1392.5 350.5 L 1416.5 350.5 L 1416.5 514.5 L 1392.5 514.5 Z M 1542.5 350.5 L 1567.5 350.5 L 1567.5 514.5 L 1542.5 514.5 Z M 1611.5 350.5 L 1636.5 350.5 L 1636.5 514.5 L 1611.5 514.5 Z M 1611.5 350.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 531.5 381.5 L 559.5 381.5 L 559.5 409.5 L 531.5 409.5 Z M 758.5 381.5 L 785.5 381.5 L 785.5 409.5 L 758.5 409.5 Z M 1285.5 381.5 L 1313.5 381.5 L 1313.5 409.5 L 1285.5 409.5 Z M 908.5 381.5 L 936.5 381.5 L 936.5 409.5 L 908.5 409.5 Z M 1134.5 437.5 L 1162.5 437.5 L 1162.5 458.5 L 1134.5 458.5 Z M 1134.5 458.5 L 1162.5 458.5 L 1162.5 465.5 L 1134.5 465.5 Z M 456.5 437.5 L 484.5 437.5 L 484.5 465.5 L 456.5 465.5 Z M 381.5 493.5 L 409.5 493.5 L 409.5 506.5 L 381.5 506.5 Z M 381.5 506.5 L 409.5 506.5 L 409.5 521.5 L 381.5 521.5 Z M 230.5 493.5 L 258.5 493.5 L 258.5 521.5 L 230.5 521.5 Z M 1210.5 493.5 L 1238.5 493.5 L 1238.5 521.5 L 1210.5 521.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface352">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -200,6 +200,5 @@
 <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 1285 419 L 1313 419 M 1285 391 L 1313 391 M 1285 391 L 1285 419 M 1313 391 L 1313 419 " 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 1285 419 L 1313 419 M 1285 391 L 1313 391 M 1313 419 L 1313 391 M 1285 419 L 1285 391 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_1.svg b/cells/nand2/sky130_fd_sc_hd__nand2_1.svg
index f065cc7..9076bb1 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_1.svg
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" 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="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 815.5 885.5 L 861.5 885.5 L 861.5 931.5 L 815.5 931.5 Z M 815.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1005.5 666.5 L 1046.5 666.5 L 1046.5 844.5 L 1005.5 844.5 Z M 890.5 666.5 L 931.5 666.5 L 931.5 844.5 L 890.5 844.5 Z M 890.5 666.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1005.5 228.5 L 1046.5 228.5 L 1046.5 502.5 L 1005.5 502.5 Z M 890.5 228.5 L 931.5 228.5 L 931.5 502.5 L 890.5 502.5 Z M 890.5 228.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 815 938 L 861 938 M 815 892 L 861 892 M 815 892 L 815 938 M 861 892 L 861 938 " 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 815 938 L 861 938 M 815 892 L 861 892 M 861 938 L 861 892 M 815 938 L 815 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_2.svg b/cells/nand2/sky130_fd_sc_hd__nand2_2.svg
index 2d03e4e..ce72eb7 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_2.svg
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" 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="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1101.5 666.5 L 1142.5 666.5 L 1142.5 844.5 L 1101.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 871.5 666.5 L 912.5 666.5 L 912.5 844.5 L 871.5 844.5 Z M 986.5 666.5 L 1027.5 666.5 L 1027.5 844.5 L 986.5 844.5 Z M 986.5 666.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1101.5 228.5 L 1142.5 228.5 L 1142.5 502.5 L 1101.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 871.5 228.5 L 912.5 228.5 L 912.5 502.5 L 871.5 502.5 Z M 986.5 228.5 L 1027.5 228.5 L 1027.5 502.5 L 986.5 502.5 Z M 986.5 228.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 689 938 L 735 938 M 689 892 L 735 892 M 689 892 L 689 938 M 735 892 L 735 938 " 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 689 938 L 735 938 M 689 892 L 735 892 M 735 938 L 735 892 M 689 938 L 689 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 941 520 L 987 520 M 941 473 L 987 473 M 941 473 L 941 520 M 987 473 L 987 520 M 689 520 L 735 520 M 689 473 L 735 473 M 689 473 L 689 520 M 735 473 L 735 520 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_4.svg b/cells/nand2/sky130_fd_sc_hd__nand2_4.svg
index 9f9e45f..66d51e1 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_4.svg
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1307.5 666.5 L 1348.5 666.5 L 1348.5 844.5 L 1307.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 733.5 666.5 L 774.5 666.5 L 774.5 844.5 L 733.5 844.5 Z M 848.5 666.5 L 889.5 666.5 L 889.5 844.5 L 848.5 844.5 Z M 962.5 666.5 L 1003.5 666.5 L 1003.5 844.5 L 962.5 844.5 Z M 1077.5 666.5 L 1118.5 666.5 L 1118.5 844.5 L 1077.5 844.5 Z M 1192.5 666.5 L 1233.5 666.5 L 1233.5 844.5 L 1192.5 844.5 Z M 1192.5 666.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1307.5 228.5 L 1348.5 228.5 L 1348.5 502.5 L 1307.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 733.5 228.5 L 774.5 228.5 L 774.5 502.5 L 733.5 502.5 Z M 848.5 228.5 L 889.5 228.5 L 889.5 502.5 L 848.5 502.5 Z M 962.5 228.5 L 1003.5 228.5 L 1003.5 502.5 L 962.5 502.5 Z M 1077.5 228.5 L 1118.5 228.5 L 1118.5 502.5 L 1077.5 502.5 Z M 1192.5 228.5 L 1233.5 228.5 L 1233.5 502.5 L 1192.5 502.5 Z M 1192.5 228.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1442 520 L 1489 520 M 1442 473 L 1489 473 M 1442 473 L 1442 520 M 1489 473 L 1489 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hd__nand2_8.svg b/cells/nand2/sky130_fd_sc_hd__nand2_8.svg
index 5b17354..0176985 100644
--- a/cells/nand2/sky130_fd_sc_hd__nand2_8.svg
+++ b/cells/nand2/sky130_fd_sc_hd__nand2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1570.5 631.5 L 1600.5 631.5 L 1600.5 763.5 L 1570.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 803.5 631.5 L 834.5 631.5 L 834.5 763.5 L 803.5 763.5 Z M 888.5 631.5 L 919.5 631.5 L 919.5 763.5 L 888.5 763.5 Z M 974.5 631.5 L 1004.5 631.5 L 1004.5 763.5 L 974.5 763.5 Z M 1059.5 631.5 L 1089.5 631.5 L 1089.5 763.5 L 1059.5 763.5 Z M 1144.5 631.5 L 1174.5 631.5 L 1174.5 763.5 L 1144.5 763.5 Z M 1229.5 631.5 L 1260.5 631.5 L 1260.5 763.5 L 1229.5 763.5 Z M 1314.5 631.5 L 1345.5 631.5 L 1345.5 763.5 L 1314.5 763.5 Z M 1399.5 631.5 L 1430.5 631.5 L 1430.5 763.5 L 1399.5 763.5 Z M 1485.5 631.5 L 1515.5 631.5 L 1515.5 763.5 L 1485.5 763.5 Z M 1485.5 631.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1570.5 307.5 L 1600.5 307.5 L 1600.5 510.5 L 1570.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 803.5 307.5 L 834.5 307.5 L 834.5 510.5 L 803.5 510.5 Z M 888.5 307.5 L 919.5 307.5 L 919.5 510.5 L 888.5 510.5 Z M 974.5 307.5 L 1004.5 307.5 L 1004.5 510.5 L 974.5 510.5 Z M 1059.5 307.5 L 1089.5 307.5 L 1089.5 510.5 L 1059.5 510.5 Z M 1144.5 307.5 L 1174.5 307.5 L 1174.5 510.5 L 1144.5 510.5 Z M 1229.5 307.5 L 1260.5 307.5 L 1260.5 510.5 L 1229.5 510.5 Z M 1314.5 307.5 L 1345.5 307.5 L 1345.5 510.5 L 1314.5 510.5 Z M 1399.5 307.5 L 1430.5 307.5 L 1430.5 510.5 L 1399.5 510.5 Z M 1485.5 307.5 L 1515.5 307.5 L 1515.5 510.5 L 1485.5 510.5 Z M 1485.5 307.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.svg b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.svg
index b751fbb..93bdf9d 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_1.svg
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 756.5 666.5 L 797.5 666.5 L 797.5 781.5 L 756.5 781.5 Z M 1003.5 666.5 L 1044.5 666.5 L 1044.5 844.5 L 1003.5 844.5 Z M 889.5 666.5 L 930.5 666.5 L 930.5 844.5 L 889.5 844.5 Z M 889.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1003.5 228.5 L 1044.5 228.5 L 1044.5 502.5 L 1003.5 502.5 Z M 756.5 387.5 L 797.5 387.5 L 797.5 502.5 L 756.5 502.5 Z M 889.5 228.5 L 930.5 228.5 L 930.5 502.5 L 889.5 502.5 Z M 889.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 689 938 L 735 938 M 689 892 L 735 892 M 689 892 L 689 938 M 735 892 L 735 938 " 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 689 938 L 735 938 M 689 892 L 735 892 M 735 938 L 735 892 M 689 938 L 689 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.svg b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.svg
index 6f73fed..7bda3a5 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_2.svg
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 630.5 666.5 L 671.5 666.5 L 671.5 781.5 L 630.5 781.5 Z M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 906.5 666.5 L 947.5 666.5 L 947.5 844.5 L 906.5 844.5 Z M 1021.5 666.5 L 1062.5 666.5 L 1062.5 844.5 L 1021.5 844.5 Z M 1251.5 666.5 L 1292.5 666.5 L 1292.5 844.5 L 1251.5 844.5 Z M 1251.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1120.5 228.5 L 1161.5 228.5 L 1161.5 502.5 L 1120.5 502.5 Z M 630.5 387.5 L 671.5 387.5 L 671.5 502.5 L 630.5 502.5 Z M 1235.5 228.5 L 1276.5 228.5 L 1276.5 502.5 L 1235.5 502.5 Z M 895.5 228.5 L 936.5 228.5 L 936.5 502.5 L 895.5 502.5 Z M 764.5 228.5 L 805.5 228.5 L 805.5 502.5 L 764.5 502.5 Z M 764.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1066 613 L 1113 613 M 1066 566 L 1113 566 M 1066 566 L 1066 613 M 1113 566 L 1113 613 M 1066 520 L 1113 520 M 1066 473 L 1113 473 M 1066 473 L 1066 520 M 1113 473 L 1113 520 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.svg b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.svg
index c1ea3af..5654afe 100644
--- a/cells/nand2b/sky130_fd_sc_hd__nand2b_4.svg
+++ b/cells/nand2b/sky130_fd_sc_hd__nand2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1441.5 666.5 L 1482.5 666.5 L 1482.5 844.5 L 1441.5 844.5 Z M 376.5 666.5 L 417.5 666.5 L 417.5 844.5 L 376.5 844.5 Z M 633.5 666.5 L 674.5 666.5 L 674.5 844.5 L 633.5 844.5 Z M 748.5 666.5 L 789.5 666.5 L 789.5 844.5 L 748.5 844.5 Z M 863.5 666.5 L 904.5 666.5 L 904.5 844.5 L 863.5 844.5 Z M 977.5 666.5 L 1018.5 666.5 L 1018.5 844.5 L 977.5 844.5 Z M 1096.5 666.5 L 1137.5 666.5 L 1137.5 844.5 L 1096.5 844.5 Z M 1211.5 666.5 L 1252.5 666.5 L 1252.5 844.5 L 1211.5 844.5 Z M 1326.5 666.5 L 1367.5 666.5 L 1367.5 844.5 L 1326.5 844.5 Z M 1326.5 666.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1441.5 228.5 L 1482.5 228.5 L 1482.5 502.5 L 1441.5 502.5 Z M 376.5 228.5 L 417.5 228.5 L 417.5 502.5 L 376.5 502.5 Z M 633.5 228.5 L 674.5 228.5 L 674.5 502.5 L 633.5 502.5 Z M 748.5 228.5 L 789.5 228.5 L 789.5 502.5 L 748.5 502.5 Z M 863.5 228.5 L 904.5 228.5 L 904.5 502.5 L 863.5 502.5 Z M 977.5 228.5 L 1018.5 228.5 L 1018.5 502.5 L 977.5 502.5 Z M 1096.5 228.5 L 1137.5 228.5 L 1137.5 502.5 L 1096.5 502.5 Z M 1211.5 228.5 L 1252.5 228.5 L 1252.5 502.5 L 1211.5 502.5 Z M 1326.5 228.5 L 1367.5 228.5 L 1367.5 502.5 L 1326.5 502.5 Z M 1326.5 228.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 309 938 L 355 938 M 309 892 L 355 892 M 309 892 L 309 938 M 355 892 L 355 938 " 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 309 938 L 355 938 M 309 892 L 355 892 M 355 938 L 355 892 M 309 938 L 309 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_1.svg b/cells/nand3/sky130_fd_sc_hd__nand3_1.svg
index 498b996..e2db696 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_1.svg
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image302" 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="#image275"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 753.5 885.5 L 800.5 885.5 L 800.5 931.5 L 753.5 931.5 Z M 753.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 666.5 L 1107.5 666.5 L 1107.5 844.5 L 1066.5 844.5 Z M 820.5 666.5 L 861.5 666.5 L 861.5 844.5 L 820.5 844.5 Z M 935.5 666.5 L 976.5 666.5 L 976.5 844.5 L 935.5 844.5 Z M 935.5 666.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 820.5 228.5 L 861.5 228.5 L 861.5 502.5 L 820.5 502.5 Z M 935.5 228.5 L 976.5 228.5 L 976.5 502.5 L 935.5 502.5 Z M 935.5 228.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface299">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 753 938 L 800 938 M 753 892 L 800 892 M 753 892 L 753 938 M 800 892 L 800 938 " 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 753 938 L 800 938 M 753 892 L 800 892 M 800 938 L 800 892 M 753 938 L 753 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1005 427 L 1051 427 M 1005 380 L 1051 380 M 1005 380 L 1005 427 M 1051 380 L 1051 427 M 753 427 L 800 427 M 753 380 L 800 380 M 753 380 L 753 427 M 800 380 L 800 427 M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_2.svg b/cells/nand3/sky130_fd_sc_hd__nand3_2.svg
index 2daf265..de0bf90 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_2.svg
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1282.5 666.5 L 1323.5 666.5 L 1323.5 844.5 L 1282.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 681.5 666.5 L 722.5 666.5 L 722.5 844.5 L 681.5 844.5 Z M 796.5 666.5 L 837.5 666.5 L 837.5 844.5 L 796.5 844.5 Z M 910.5 666.5 L 951.5 666.5 L 951.5 844.5 L 910.5 844.5 Z M 1168.5 666.5 L 1209.5 666.5 L 1209.5 844.5 L 1168.5 844.5 Z M 1168.5 666.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1282.5 228.5 L 1323.5 228.5 L 1323.5 502.5 L 1282.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 796.5 228.5 L 837.5 228.5 L 837.5 502.5 L 796.5 502.5 Z M 910.5 228.5 L 951.5 228.5 L 951.5 502.5 L 910.5 502.5 Z M 1168.5 228.5 L 1209.5 228.5 L 1209.5 502.5 L 1168.5 502.5 Z M 1168.5 228.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hd__nand3_4.svg b/cells/nand3/sky130_fd_sc_hd__nand3_4.svg
index 8657003..6cda135 100644
--- a/cells/nand3/sky130_fd_sc_hd__nand3_4.svg
+++ b/cells/nand3/sky130_fd_sc_hd__nand3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" 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="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 252.5 829.5 L 291.5 829.5 L 291.5 868.5 L 252.5 868.5 Z M 252.5 829.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1491.5 645.5 L 1526.5 645.5 L 1526.5 794.5 L 1491.5 794.5 Z M 309.5 645.5 L 343.5 645.5 L 343.5 794.5 L 309.5 794.5 Z M 405.5 645.5 L 440.5 645.5 L 440.5 794.5 L 405.5 794.5 Z M 502.5 645.5 L 536.5 645.5 L 536.5 794.5 L 502.5 794.5 Z M 598.5 645.5 L 633.5 645.5 L 633.5 794.5 L 598.5 794.5 Z M 695.5 645.5 L 730.5 645.5 L 730.5 794.5 L 695.5 794.5 Z M 792.5 645.5 L 826.5 645.5 L 826.5 794.5 L 792.5 794.5 Z M 888.5 645.5 L 923.5 645.5 L 923.5 794.5 L 888.5 794.5 Z M 985.5 645.5 L 1019.5 645.5 L 1019.5 794.5 L 985.5 794.5 Z M 1201.5 645.5 L 1236.5 645.5 L 1236.5 794.5 L 1201.5 794.5 Z M 1298.5 645.5 L 1332.5 645.5 L 1332.5 794.5 L 1298.5 794.5 Z M 1394.5 645.5 L 1429.5 645.5 L 1429.5 794.5 L 1394.5 794.5 Z M 1394.5 645.5 "/>
 </clipPath>
-<image id="image310" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1491.5 277.5 L 1526.5 277.5 L 1526.5 507.5 L 1491.5 507.5 Z M 309.5 277.5 L 343.5 277.5 L 343.5 507.5 L 309.5 507.5 Z M 405.5 277.5 L 440.5 277.5 L 440.5 507.5 L 405.5 507.5 Z M 502.5 277.5 L 536.5 277.5 L 536.5 507.5 L 502.5 507.5 Z M 598.5 277.5 L 633.5 277.5 L 633.5 507.5 L 598.5 507.5 Z M 695.5 277.5 L 730.5 277.5 L 730.5 507.5 L 695.5 507.5 Z M 792.5 277.5 L 826.5 277.5 L 826.5 507.5 L 792.5 507.5 Z M 888.5 277.5 L 923.5 277.5 L 923.5 507.5 L 888.5 507.5 Z M 985.5 277.5 L 1019.5 277.5 L 1019.5 507.5 L 985.5 507.5 Z M 1201.5 277.5 L 1236.5 277.5 L 1236.5 507.5 L 1201.5 507.5 Z M 1298.5 277.5 L 1332.5 277.5 L 1332.5 507.5 L 1298.5 507.5 Z M 1394.5 277.5 L 1429.5 277.5 L 1429.5 507.5 L 1394.5 507.5 Z M 1394.5 277.5 "/>
 </clipPath>
-<image id="image311" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image312" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <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 252 876 L 291 876 M 252 837 L 291 837 M 252 837 L 252 876 M 291 837 L 291 876 " 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 252 876 L 291 876 M 252 837 L 291 837 M 291 876 L 291 837 M 252 876 L 252 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.svg b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.svg
index d3bc721..e2ad96c 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_1.svg
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 729.5 666.5 L 770.5 666.5 L 770.5 781.5 L 729.5 781.5 Z M 976.5 666.5 L 1017.5 666.5 L 1017.5 844.5 L 976.5 844.5 Z M 861.5 666.5 L 902.5 666.5 L 902.5 844.5 L 861.5 844.5 Z M 1122.5 666.5 L 1163.5 666.5 L 1163.5 844.5 L 1122.5 844.5 Z M 1122.5 666.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1122.5 228.5 L 1163.5 228.5 L 1163.5 502.5 L 1122.5 502.5 Z M 729.5 387.5 L 770.5 387.5 L 770.5 502.5 L 729.5 502.5 Z M 976.5 228.5 L 1017.5 228.5 L 1017.5 502.5 L 976.5 502.5 Z M 861.5 228.5 L 902.5 228.5 L 902.5 502.5 L 861.5 502.5 Z M 861.5 228.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,5 @@
 <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 625 938 L 671 938 M 625 892 L 671 892 M 625 892 L 625 938 M 671 892 L 671 938 " 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 625 938 L 671 938 M 625 892 L 671 892 M 671 938 L 671 892 M 625 938 L 625 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.svg b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.svg
index 40c3f8c..75019e0 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_2.svg
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 503.5 729.5 L 544.5 729.5 L 544.5 844.5 L 503.5 844.5 Z M 1369.5 666.5 L 1410.5 666.5 L 1410.5 844.5 L 1369.5 844.5 Z M 1139.5 666.5 L 1180.5 666.5 L 1180.5 844.5 L 1139.5 844.5 Z M 1024.5 666.5 L 1065.5 666.5 L 1065.5 844.5 L 1024.5 844.5 Z M 767.5 666.5 L 808.5 666.5 L 808.5 844.5 L 767.5 844.5 Z M 652.5 666.5 L 693.5 666.5 L 693.5 844.5 L 652.5 844.5 Z M 652.5 666.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 503.5 228.5 L 544.5 228.5 L 544.5 343.5 L 503.5 343.5 Z M 997.5 228.5 L 1038.5 228.5 L 1038.5 502.5 L 997.5 502.5 Z M 652.5 228.5 L 693.5 228.5 L 693.5 502.5 L 652.5 502.5 Z M 767.5 228.5 L 808.5 228.5 L 808.5 502.5 L 767.5 502.5 Z M 882.5 228.5 L 923.5 228.5 L 923.5 502.5 L 882.5 502.5 Z M 1369.5 228.5 L 1410.5 228.5 L 1410.5 502.5 L 1369.5 502.5 Z M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 1254.5 228.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1065 520 L 1111 520 M 1065 473 L 1111 473 M 1065 473 L 1065 520 M 1111 473 L 1111 520 M 1196 520 L 1243 520 M 1196 473 L 1243 473 M 1196 473 L 1196 520 M 1243 473 L 1243 520 M 813 520 L 860 520 M 813 473 L 860 473 M 813 473 L 813 520 M 860 473 L 860 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.svg b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.svg
index e76a7ce..c4e932e 100644
--- a/cells/nand3b/sky130_fd_sc_hd__nand3b_4.svg
+++ b/cells/nand3b/sky130_fd_sc_hd__nand3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1525.5 631.5 L 1556.5 631.5 L 1556.5 763.5 L 1525.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 483.5 631.5 L 513.5 631.5 L 513.5 763.5 L 483.5 763.5 Z M 568.5 631.5 L 598.5 631.5 L 598.5 763.5 L 568.5 763.5 Z M 653.5 631.5 L 684.5 631.5 L 684.5 763.5 L 653.5 763.5 Z M 738.5 631.5 L 769.5 631.5 L 769.5 763.5 L 738.5 763.5 Z M 824.5 631.5 L 854.5 631.5 L 854.5 763.5 L 824.5 763.5 Z M 909.5 631.5 L 939.5 631.5 L 939.5 763.5 L 909.5 763.5 Z M 994.5 631.5 L 1024.5 631.5 L 1024.5 763.5 L 994.5 763.5 Z M 1079.5 631.5 L 1109.5 631.5 L 1109.5 763.5 L 1079.5 763.5 Z M 1270.5 631.5 L 1300.5 631.5 L 1300.5 763.5 L 1270.5 763.5 Z M 1355.5 631.5 L 1385.5 631.5 L 1385.5 763.5 L 1355.5 763.5 Z M 1440.5 631.5 L 1470.5 631.5 L 1470.5 763.5 L 1440.5 763.5 Z M 1440.5 631.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1525.5 307.5 L 1556.5 307.5 L 1556.5 510.5 L 1525.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 483.5 307.5 L 513.5 307.5 L 513.5 510.5 L 483.5 510.5 Z M 568.5 307.5 L 598.5 307.5 L 598.5 510.5 L 568.5 510.5 Z M 653.5 307.5 L 684.5 307.5 L 684.5 510.5 L 653.5 510.5 Z M 738.5 307.5 L 769.5 307.5 L 769.5 510.5 L 738.5 510.5 Z M 824.5 307.5 L 854.5 307.5 L 854.5 510.5 L 824.5 510.5 Z M 909.5 307.5 L 939.5 307.5 L 939.5 510.5 L 909.5 510.5 Z M 994.5 307.5 L 1024.5 307.5 L 1024.5 510.5 L 994.5 510.5 Z M 1079.5 307.5 L 1109.5 307.5 L 1109.5 510.5 L 1079.5 510.5 Z M 1270.5 307.5 L 1300.5 307.5 L 1300.5 510.5 L 1270.5 510.5 Z M 1355.5 307.5 L 1385.5 307.5 L 1385.5 510.5 L 1355.5 510.5 Z M 1440.5 307.5 L 1470.5 307.5 L 1470.5 510.5 L 1440.5 510.5 Z M 1440.5 307.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_1.svg b/cells/nand4/sky130_fd_sc_hd__nand4_1.svg
index 1f74bfb..891e426 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_1.svg
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" 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="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1117.5 666.5 L 1158.5 666.5 L 1158.5 844.5 L 1117.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 871.5 666.5 L 912.5 666.5 L 912.5 844.5 L 871.5 844.5 Z M 986.5 666.5 L 1027.5 666.5 L 1027.5 844.5 L 986.5 844.5 Z M 986.5 666.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1117.5 228.5 L 1158.5 228.5 L 1158.5 502.5 L 1117.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 871.5 228.5 L 912.5 228.5 L 912.5 502.5 L 871.5 502.5 Z M 986.5 228.5 L 1027.5 228.5 L 1027.5 502.5 L 986.5 502.5 Z M 986.5 228.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 689 194 L 735 194 M 689 148 L 735 148 M 689 148 L 689 194 M 735 148 L 735 194 " 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 689 194 L 735 194 M 689 148 L 735 148 M 735 194 L 735 148 M 689 194 L 689 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 815 427 L 861 427 M 815 380 L 861 380 M 815 380 L 815 427 M 861 380 L 861 427 M 1192 613 L 1239 613 M 1192 566 L 1239 566 M 1192 566 L 1192 613 M 1239 566 L 1239 613 M 815 334 L 861 334 M 815 287 L 861 287 M 815 287 L 815 334 M 861 287 L 861 334 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_2.svg b/cells/nand4/sky130_fd_sc_hd__nand4_2.svg
index 5eab8dc..264f3b0 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_2.svg
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1396.5 666.5 L 1437.5 666.5 L 1437.5 844.5 L 1396.5 844.5 Z M 439.5 666.5 L 480.5 666.5 L 480.5 844.5 L 439.5 844.5 Z M 553.5 666.5 L 594.5 666.5 L 594.5 844.5 L 553.5 844.5 Z M 668.5 666.5 L 709.5 666.5 L 709.5 844.5 L 668.5 844.5 Z M 783.5 666.5 L 824.5 666.5 L 824.5 844.5 L 783.5 844.5 Z M 1051.5 666.5 L 1092.5 666.5 L 1092.5 844.5 L 1051.5 844.5 Z M 1166.5 666.5 L 1207.5 666.5 L 1207.5 844.5 L 1166.5 844.5 Z M 1281.5 666.5 L 1322.5 666.5 L 1322.5 844.5 L 1281.5 844.5 Z M 1281.5 666.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1396.5 228.5 L 1437.5 228.5 L 1437.5 502.5 L 1396.5 502.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 502.5 L 439.5 502.5 Z M 553.5 228.5 L 594.5 228.5 L 594.5 502.5 L 553.5 502.5 Z M 668.5 228.5 L 709.5 228.5 L 709.5 502.5 L 668.5 502.5 Z M 783.5 228.5 L 824.5 228.5 L 824.5 502.5 L 783.5 502.5 Z M 942.5 228.5 L 983.5 228.5 L 983.5 502.5 L 942.5 502.5 Z M 1057.5 228.5 L 1098.5 228.5 L 1098.5 502.5 L 1057.5 502.5 Z M 1281.5 228.5 L 1322.5 228.5 L 1322.5 502.5 L 1281.5 502.5 Z M 1281.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hd__nand4_4.svg b/cells/nand4/sky130_fd_sc_hd__nand4_4.svg
index 549a1ed..e32bec6 100644
--- a/cells/nand4/sky130_fd_sc_hd__nand4_4.svg
+++ b/cells/nand4/sky130_fd_sc_hd__nand4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1603.5 626.5 L 1631.5 626.5 L 1631.5 750.5 L 1603.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 608.5 626.5 L 636.5 626.5 L 636.5 750.5 L 608.5 750.5 Z M 688.5 626.5 L 717.5 626.5 L 717.5 750.5 L 688.5 750.5 Z M 768.5 626.5 L 797.5 626.5 L 797.5 750.5 L 768.5 750.5 Z M 849.5 626.5 L 878.5 626.5 L 878.5 750.5 L 849.5 750.5 Z M 1029.5 626.5 L 1057.5 626.5 L 1057.5 750.5 L 1029.5 750.5 Z M 1109.5 626.5 L 1138.5 626.5 L 1138.5 750.5 L 1109.5 750.5 Z M 1189.5 626.5 L 1218.5 626.5 L 1218.5 750.5 L 1189.5 750.5 Z M 1270.5 626.5 L 1298.5 626.5 L 1298.5 750.5 L 1270.5 750.5 Z M 1362.5 626.5 L 1390.5 626.5 L 1390.5 750.5 L 1362.5 750.5 Z M 1442.5 626.5 L 1471.5 626.5 L 1471.5 750.5 L 1442.5 750.5 Z M 1522.5 626.5 L 1551.5 626.5 L 1551.5 750.5 L 1522.5 750.5 Z M 1522.5 626.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1603.5 320.5 L 1631.5 320.5 L 1631.5 511.5 L 1603.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 688.5 320.5 L 717.5 320.5 L 717.5 511.5 L 688.5 511.5 Z M 768.5 320.5 L 797.5 320.5 L 797.5 511.5 L 768.5 511.5 Z M 849.5 320.5 L 878.5 320.5 L 878.5 511.5 L 849.5 511.5 Z M 1029.5 320.5 L 1057.5 320.5 L 1057.5 511.5 L 1029.5 511.5 Z M 1109.5 320.5 L 1138.5 320.5 L 1138.5 511.5 L 1109.5 511.5 Z M 1189.5 320.5 L 1218.5 320.5 L 1218.5 511.5 L 1189.5 511.5 Z M 1270.5 320.5 L 1298.5 320.5 L 1298.5 511.5 L 1270.5 511.5 Z M 1362.5 320.5 L 1390.5 320.5 L 1390.5 511.5 L 1362.5 511.5 Z M 1442.5 320.5 L 1471.5 320.5 L 1471.5 511.5 L 1442.5 511.5 Z M 1522.5 320.5 L 1551.5 320.5 L 1551.5 511.5 L 1522.5 511.5 Z M 1522.5 320.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,5 @@
 <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 239 300 L 272 300 M 239 268 L 272 268 M 239 268 L 239 300 M 272 268 L 272 300 " 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 239 300 L 272 300 M 239 268 L 272 268 M 272 300 L 272 268 M 239 300 L 239 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.svg b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.svg
index 1ba7e46..29c0fff 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_1.svg
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image315" 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="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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="#image315"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 651.5 666.5 L 692.5 666.5 L 692.5 781.5 L 651.5 781.5 Z M 1060.5 666.5 L 1101.5 666.5 L 1101.5 844.5 L 1060.5 844.5 Z M 798.5 666.5 L 839.5 666.5 L 839.5 844.5 L 798.5 844.5 Z M 913.5 666.5 L 954.5 666.5 L 954.5 844.5 L 913.5 844.5 Z M 1207.5 666.5 L 1248.5 666.5 L 1248.5 844.5 L 1207.5 844.5 Z M 1207.5 666.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image316"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1060.5 228.5 L 1101.5 228.5 L 1101.5 502.5 L 1060.5 502.5 Z M 666.5 387.5 L 707.5 387.5 L 707.5 502.5 L 666.5 502.5 Z M 1207.5 228.5 L 1248.5 228.5 L 1248.5 502.5 L 1207.5 502.5 Z M 913.5 228.5 L 954.5 228.5 L 954.5 502.5 L 913.5 502.5 Z M 798.5 228.5 L 839.5 228.5 L 839.5 502.5 L 798.5 502.5 Z M 798.5 228.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1065 427 L 1111 427 M 1065 380 L 1111 380 M 1065 380 L 1065 427 M 1111 380 L 1111 427 M 939 427 L 986 427 M 939 380 L 986 380 M 939 380 L 939 427 M 986 380 L 986 427 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.svg b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.svg
index 138c24d..c974c10 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_2.svg
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image347" 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="#image347"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1278.5 662.5 L 1318.5 662.5 L 1318.5 835.5 L 1278.5 835.5 Z M 331.5 723.5 L 371.5 723.5 L 371.5 835.5 L 331.5 835.5 Z M 1413.5 662.5 L 1453.5 662.5 L 1453.5 835.5 L 1413.5 835.5 Z M 1525.5 662.5 L 1565.5 662.5 L 1565.5 835.5 L 1525.5 835.5 Z M 1166.5 662.5 L 1206.5 662.5 L 1206.5 835.5 L 1166.5 835.5 Z M 916.5 662.5 L 956.5 662.5 L 956.5 835.5 L 916.5 835.5 Z M 804.5 662.5 L 844.5 662.5 L 844.5 835.5 L 804.5 835.5 Z M 693.5 662.5 L 732.5 662.5 L 732.5 835.5 L 693.5 835.5 Z M 581.5 662.5 L 621.5 662.5 L 621.5 835.5 L 581.5 835.5 Z M 581.5 662.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 331.5 237.5 L 371.5 237.5 L 371.5 348.5 L 331.5 348.5 Z M 1153.5 237.5 L 1193.5 237.5 L 1193.5 503.5 L 1153.5 503.5 Z M 581.5 237.5 L 621.5 237.5 L 621.5 503.5 L 581.5 503.5 Z M 693.5 237.5 L 732.5 237.5 L 732.5 503.5 L 693.5 503.5 Z M 804.5 237.5 L 844.5 237.5 L 844.5 503.5 L 804.5 503.5 Z M 916.5 237.5 L 956.5 237.5 L 956.5 503.5 L 916.5 503.5 Z M 1400.5 237.5 L 1440.5 237.5 L 1440.5 503.5 L 1400.5 503.5 Z M 1264.5 237.5 L 1304.5 237.5 L 1304.5 503.5 L 1264.5 503.5 Z M 1512.5 237.5 L 1552.5 237.5 L 1552.5 503.5 L 1512.5 503.5 Z M 1512.5 237.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image350"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.svg b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.svg
index 2d7edf8..95d9e20 100644
--- a/cells/nand4b/sky130_fd_sc_hd__nand4b_4.svg
+++ b/cells/nand4b/sky130_fd_sc_hd__nand4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 233.5 754.5 L 262.5 754.5 L 262.5 783.5 L 233.5 783.5 Z M 233.5 754.5 "/>
 </clipPath>
 <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="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1610.5 616.5 L 1636.5 616.5 L 1636.5 728.5 L 1610.5 728.5 Z M 275.5 616.5 L 301.5 616.5 L 301.5 728.5 L 275.5 728.5 Z M 436.5 616.5 L 462.5 616.5 L 462.5 728.5 L 436.5 728.5 Z M 509.5 616.5 L 535.5 616.5 L 535.5 728.5 L 509.5 728.5 Z M 581.5 616.5 L 607.5 616.5 L 607.5 728.5 L 581.5 728.5 Z M 653.5 616.5 L 679.5 616.5 L 679.5 728.5 L 653.5 728.5 Z M 726.5 616.5 L 751.5 616.5 L 751.5 728.5 L 726.5 728.5 Z M 798.5 616.5 L 824.5 616.5 L 824.5 728.5 L 798.5 728.5 Z M 870.5 616.5 L 896.5 616.5 L 896.5 728.5 L 870.5 728.5 Z M 942.5 616.5 L 968.5 616.5 L 968.5 728.5 L 942.5 728.5 Z M 1104.5 616.5 L 1130.5 616.5 L 1130.5 728.5 L 1104.5 728.5 Z M 1176.5 616.5 L 1202.5 616.5 L 1202.5 728.5 L 1176.5 728.5 Z M 1249.5 616.5 L 1275.5 616.5 L 1275.5 728.5 L 1249.5 728.5 Z M 1321.5 616.5 L 1347.5 616.5 L 1347.5 728.5 L 1321.5 728.5 Z M 1393.5 616.5 L 1419.5 616.5 L 1419.5 728.5 L 1393.5 728.5 Z M 1466.5 616.5 L 1491.5 616.5 L 1491.5 728.5 L 1466.5 728.5 Z M 1538.5 616.5 L 1564.5 616.5 L 1564.5 728.5 L 1538.5 728.5 Z M 1538.5 616.5 "/>
 </clipPath>
-<image id="image320" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 341.5 L 1636.5 341.5 L 1636.5 513.5 L 1610.5 513.5 Z M 275.5 341.5 L 301.5 341.5 L 301.5 513.5 L 275.5 513.5 Z M 436.5 341.5 L 462.5 341.5 L 462.5 513.5 L 436.5 513.5 Z M 509.5 341.5 L 535.5 341.5 L 535.5 513.5 L 509.5 513.5 Z M 581.5 341.5 L 607.5 341.5 L 607.5 513.5 L 581.5 513.5 Z M 653.5 341.5 L 679.5 341.5 L 679.5 513.5 L 653.5 513.5 Z M 726.5 341.5 L 751.5 341.5 L 751.5 513.5 L 726.5 513.5 Z M 798.5 341.5 L 824.5 341.5 L 824.5 513.5 L 798.5 513.5 Z M 870.5 341.5 L 896.5 341.5 L 896.5 513.5 L 870.5 513.5 Z M 942.5 341.5 L 968.5 341.5 L 968.5 513.5 L 942.5 513.5 Z M 1104.5 341.5 L 1130.5 341.5 L 1130.5 513.5 L 1104.5 513.5 Z M 1176.5 341.5 L 1202.5 341.5 L 1202.5 513.5 L 1176.5 513.5 Z M 1249.5 341.5 L 1275.5 341.5 L 1275.5 513.5 L 1249.5 513.5 Z M 1321.5 341.5 L 1347.5 341.5 L 1347.5 513.5 L 1321.5 513.5 Z M 1393.5 341.5 L 1419.5 341.5 L 1419.5 513.5 L 1393.5 513.5 Z M 1466.5 341.5 L 1491.5 341.5 L 1491.5 513.5 L 1466.5 513.5 Z M 1538.5 341.5 L 1564.5 341.5 L 1564.5 513.5 L 1538.5 513.5 Z M 1538.5 341.5 "/>
 </clipPath>
-<image id="image321" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image322" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface316">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -184,6 +184,5 @@
 <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 233 793 L 262 793 M 233 764 L 262 764 M 233 764 L 233 793 M 262 764 L 262 793 " 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 233 793 L 262 793 M 233 764 L 262 764 M 262 793 L 262 764 M 233 793 L 233 764 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.svg b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.svg
index 9dcff06..4343fe9 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.svg
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" 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="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 503.5 666.5 L 544.5 666.5 L 544.5 781.5 L 503.5 781.5 Z M 1330.5 729.5 L 1371.5 729.5 L 1371.5 844.5 L 1330.5 844.5 Z M 1073.5 666.5 L 1114.5 666.5 L 1114.5 844.5 L 1073.5 844.5 Z M 936.5 666.5 L 977.5 666.5 L 977.5 844.5 L 936.5 844.5 Z M 800.5 666.5 L 841.5 666.5 L 841.5 844.5 L 800.5 844.5 Z M 652.5 666.5 L 693.5 666.5 L 693.5 844.5 L 652.5 844.5 Z M 652.5 666.5 "/>
 </clipPath>
-<image id="image311" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1330.5 228.5 L 1371.5 228.5 L 1371.5 343.5 L 1330.5 343.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 343.5 L 503.5 343.5 Z M 652.5 228.5 L 693.5 228.5 L 693.5 502.5 L 652.5 502.5 Z M 800.5 228.5 L 841.5 228.5 L 841.5 502.5 L 800.5 502.5 Z M 936.5 228.5 L 977.5 228.5 L 977.5 502.5 L 936.5 502.5 Z M 1073.5 228.5 L 1114.5 228.5 L 1114.5 502.5 L 1073.5 502.5 Z M 1073.5 228.5 "/>
 </clipPath>
-<image id="image312" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image313" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 434 194 L 481 194 M 434 148 L 481 148 M 434 148 L 434 194 M 481 148 L 481 194 " 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 434 194 L 481 194 M 434 148 L 481 148 M 481 194 L 481 148 M 434 194 L 434 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1322 427 L 1369 427 M 1322 380 L 1369 380 M 1322 380 L 1322 427 M 1369 380 L 1369 427 M 813 427 L 860 427 M 813 380 L 860 380 M 813 380 L 813 427 M 860 380 L 860 427 M 562 613 L 608 613 M 562 566 L 608 566 M 562 566 L 562 613 M 608 566 L 608 613 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.svg b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.svg
index 8d1b9b0..b98d5e6 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.svg
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <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="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1352.5 653.5 L 1389.5 653.5 L 1389.5 813.5 L 1352.5 813.5 Z M 319.5 710.5 L 356.5 710.5 L 356.5 813.5 L 319.5 813.5 Z M 423.5 710.5 L 460.5 710.5 L 460.5 813.5 L 423.5 813.5 Z M 1560.5 653.5 L 1597.5 653.5 L 1597.5 813.5 L 1560.5 813.5 Z M 1249.5 653.5 L 1286.5 653.5 L 1286.5 813.5 L 1249.5 813.5 Z M 1017.5 653.5 L 1054.5 653.5 L 1054.5 813.5 L 1017.5 813.5 Z M 913.5 653.5 L 950.5 653.5 L 950.5 813.5 L 913.5 813.5 Z M 810.5 653.5 L 847.5 653.5 L 847.5 813.5 L 810.5 813.5 Z M 706.5 653.5 L 743.5 653.5 L 743.5 813.5 L 706.5 813.5 Z M 1456.5 653.5 L 1493.5 653.5 L 1493.5 813.5 L 1456.5 813.5 Z M 1456.5 653.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 423.5 258.5 L 460.5 258.5 L 460.5 362.5 L 423.5 362.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 362.5 L 319.5 362.5 Z M 1249.5 258.5 L 1286.5 258.5 L 1286.5 505.5 L 1249.5 505.5 Z M 706.5 258.5 L 743.5 258.5 L 743.5 505.5 L 706.5 505.5 Z M 810.5 258.5 L 847.5 258.5 L 847.5 505.5 L 810.5 505.5 Z M 913.5 258.5 L 950.5 258.5 L 950.5 505.5 L 913.5 505.5 Z M 1560.5 258.5 L 1597.5 258.5 L 1597.5 505.5 L 1560.5 505.5 Z M 1456.5 258.5 L 1493.5 258.5 L 1493.5 505.5 L 1456.5 505.5 Z M 1352.5 258.5 L 1389.5 258.5 L 1389.5 505.5 L 1352.5 505.5 Z M 1017.5 258.5 L 1054.5 258.5 L 1054.5 505.5 L 1017.5 505.5 Z M 1017.5 258.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 938.5 557.5 L 980.5 557.5 L 980.5 564.5 L 938.5 564.5 Z M 938.5 564.5 L 980.5 564.5 L 980.5 599.5 L 938.5 599.5 Z M 483.5 557.5 L 525.5 557.5 L 525.5 599.5 L 483.5 599.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.svg b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.svg
index 4da7ba7..bdb4abe 100644
--- a/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.svg
+++ b/cells/nand4bb/sky130_fd_sc_hd__nand4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1631.5 605.5 L 1654.5 605.5 L 1654.5 702.5 L 1631.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 565.5 605.5 L 587.5 605.5 L 587.5 702.5 L 565.5 702.5 Z M 627.5 605.5 L 650.5 605.5 L 650.5 702.5 L 627.5 702.5 Z M 690.5 605.5 L 713.5 605.5 L 713.5 702.5 L 690.5 702.5 Z M 753.5 605.5 L 775.5 605.5 L 775.5 702.5 L 753.5 702.5 Z M 816.5 605.5 L 838.5 605.5 L 838.5 702.5 L 816.5 702.5 Z M 878.5 605.5 L 901.5 605.5 L 901.5 702.5 L 878.5 702.5 Z M 941.5 605.5 L 964.5 605.5 L 964.5 702.5 L 941.5 702.5 Z M 1004.5 605.5 L 1026.5 605.5 L 1026.5 702.5 L 1004.5 702.5 Z M 1192.5 605.5 L 1215.5 605.5 L 1215.5 702.5 L 1192.5 702.5 Z M 1255.5 605.5 L 1277.5 605.5 L 1277.5 702.5 L 1255.5 702.5 Z M 1318.5 605.5 L 1340.5 605.5 L 1340.5 702.5 L 1318.5 702.5 Z M 1380.5 605.5 L 1403.5 605.5 L 1403.5 702.5 L 1380.5 702.5 Z M 1443.5 605.5 L 1466.5 605.5 L 1466.5 702.5 L 1443.5 702.5 Z M 1506.5 605.5 L 1528.5 605.5 L 1528.5 702.5 L 1506.5 702.5 Z M 1569.5 605.5 L 1591.5 605.5 L 1591.5 702.5 L 1569.5 702.5 Z M 1569.5 605.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1631.5 366.5 L 1654.5 366.5 L 1654.5 516.5 L 1631.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 565.5 366.5 L 587.5 366.5 L 587.5 516.5 L 565.5 516.5 Z M 627.5 366.5 L 650.5 366.5 L 650.5 516.5 L 627.5 516.5 Z M 690.5 366.5 L 713.5 366.5 L 713.5 516.5 L 690.5 516.5 Z M 753.5 366.5 L 775.5 366.5 L 775.5 516.5 L 753.5 516.5 Z M 816.5 366.5 L 838.5 366.5 L 838.5 516.5 L 816.5 516.5 Z M 878.5 366.5 L 901.5 366.5 L 901.5 516.5 L 878.5 516.5 Z M 941.5 366.5 L 964.5 366.5 L 964.5 516.5 L 941.5 516.5 Z M 1004.5 366.5 L 1026.5 366.5 L 1026.5 516.5 L 1004.5 516.5 Z M 1192.5 366.5 L 1215.5 366.5 L 1215.5 516.5 L 1192.5 516.5 Z M 1255.5 366.5 L 1277.5 366.5 L 1277.5 516.5 L 1255.5 516.5 Z M 1318.5 366.5 L 1340.5 366.5 L 1340.5 516.5 L 1318.5 516.5 Z M 1380.5 366.5 L 1403.5 366.5 L 1403.5 516.5 L 1380.5 516.5 Z M 1443.5 366.5 L 1466.5 366.5 L 1466.5 516.5 L 1443.5 516.5 Z M 1506.5 366.5 L 1528.5 366.5 L 1528.5 516.5 L 1506.5 516.5 Z M 1569.5 366.5 L 1591.5 366.5 L 1591.5 516.5 L 1569.5 516.5 Z M 1569.5 366.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 842.5 547.5 L 868.5 547.5 L 868.5 551.5 L 842.5 551.5 Z M 842.5 551.5 L 868.5 551.5 L 868.5 572.5 L 842.5 572.5 Z M 499.5 547.5 L 524.5 547.5 L 524.5 572.5 L 499.5 572.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface310">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,5 @@
 <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 225 761 L 250 761 M 225 735 L 250 735 M 225 735 L 225 761 M 250 735 L 250 761 " 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 225 761 L 250 761 M 225 735 L 250 735 M 250 761 L 250 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 225 583 L 251 583 M 225 557 L 251 557 M 225 557 L 225 583 M 251 557 L 251 583 M 294 583 L 320 583 M 294 557 L 320 557 M 294 557 L 294 583 M 320 557 L 320 583 M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_1.svg b/cells/nor2/sky130_fd_sc_hd__nor2_1.svg
index e86d0cc..bbfceb5 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_1.svg
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 724.5 112.5 L 1206.5 112.5 L 1206.5 551.5 L 724.5 551.5 Z M 724.5 112.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image302" 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="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 817.5 885.5 L 864.5 885.5 L 864.5 931.5 L 817.5 931.5 Z M 817.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 999.5 666.5 L 1040.5 666.5 L 1040.5 844.5 L 999.5 844.5 Z M 884.5 666.5 L 925.5 666.5 L 925.5 844.5 L 884.5 844.5 Z M 884.5 666.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 983.5 228.5 L 1024.5 228.5 L 1024.5 502.5 L 983.5 502.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 502.5 L 884.5 502.5 Z M 884.5 228.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 816.5 141.5 L 863.5 141.5 L 863.5 187.5 L 816.5 187.5 Z M 1068.5 141.5 L 1114.5 141.5 L 1114.5 187.5 L 1068.5 187.5 Z M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 816.5 885.5 L 863.5 885.5 L 863.5 931.5 L 816.5 931.5 Z M 1068.5 885.5 L 1114.5 885.5 L 1114.5 931.5 L 1068.5 931.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface299">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 817 938 L 864 938 M 817 892 L 864 892 M 817 892 L 817 938 M 864 892 L 864 938 " 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 817 938 L 864 938 M 817 892 L 864 892 M 864 938 L 864 892 M 817 938 L 817 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 167 L 776 174 M 772 171 L 779 171 " 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 776 166 L 776 175 M 771 171 L 780 171 M 775 172 L 777 172 M 775 170 L 777 170 M 775 170 L 775 172 M 777 170 L 777 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_2.svg b/cells/nor2/sky130_fd_sc_hd__nor2_2.svg
index 9ae9c1a..9087b54 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_2.svg
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image302" 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="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1106.5 666.5 L 1147.5 666.5 L 1147.5 844.5 L 1106.5 844.5 Z M 761.5 666.5 L 802.5 666.5 L 802.5 844.5 L 761.5 844.5 Z M 876.5 666.5 L 917.5 666.5 L 917.5 844.5 L 876.5 844.5 Z M 991.5 666.5 L 1032.5 666.5 L 1032.5 844.5 L 991.5 844.5 Z M 991.5 666.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1106.5 228.5 L 1147.5 228.5 L 1147.5 502.5 L 1106.5 502.5 Z M 761.5 228.5 L 802.5 228.5 L 802.5 502.5 L 761.5 502.5 Z M 876.5 228.5 L 917.5 228.5 L 917.5 502.5 L 876.5 502.5 Z M 991.5 228.5 L 1032.5 228.5 L 1032.5 502.5 L 991.5 502.5 Z M 991.5 228.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface299">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 689 938 L 735 938 M 689 892 L 735 892 M 689 892 L 689 938 M 735 892 L 735 938 " 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 689 938 L 735 938 M 689 892 L 735 892 M 735 938 L 735 892 M 689 938 L 689 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1066 520 L 1113 520 M 1066 473 L 1113 473 M 1066 473 L 1066 520 M 1113 473 L 1113 520 M 815 520 L 861 520 M 815 473 L 861 473 M 815 473 L 815 520 M 861 473 L 861 520 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_4.svg b/cells/nor2/sky130_fd_sc_hd__nor2_4.svg
index 020fe01..26fa067 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_4.svg
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1313.5 666.5 L 1354.5 666.5 L 1354.5 844.5 L 1313.5 844.5 Z M 508.5 666.5 L 549.5 666.5 L 549.5 844.5 L 508.5 844.5 Z M 623.5 666.5 L 664.5 666.5 L 664.5 844.5 L 623.5 844.5 Z M 738.5 666.5 L 779.5 666.5 L 779.5 844.5 L 738.5 844.5 Z M 853.5 666.5 L 894.5 666.5 L 894.5 844.5 L 853.5 844.5 Z M 968.5 666.5 L 1009.5 666.5 L 1009.5 844.5 L 968.5 844.5 Z M 1083.5 666.5 L 1124.5 666.5 L 1124.5 844.5 L 1083.5 844.5 Z M 1198.5 666.5 L 1239.5 666.5 L 1239.5 844.5 L 1198.5 844.5 Z M 1198.5 666.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1313.5 228.5 L 1354.5 228.5 L 1354.5 502.5 L 1313.5 502.5 Z M 508.5 228.5 L 549.5 228.5 L 549.5 502.5 L 508.5 502.5 Z M 623.5 228.5 L 664.5 228.5 L 664.5 502.5 L 623.5 502.5 Z M 738.5 228.5 L 779.5 228.5 L 779.5 502.5 L 738.5 502.5 Z M 853.5 228.5 L 894.5 228.5 L 894.5 502.5 L 853.5 502.5 Z M 968.5 228.5 L 1009.5 228.5 L 1009.5 502.5 L 968.5 502.5 Z M 1083.5 228.5 L 1124.5 228.5 L 1124.5 502.5 L 1083.5 502.5 Z M 1198.5 228.5 L 1239.5 228.5 L 1239.5 502.5 L 1198.5 502.5 Z M 1198.5 228.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 436 520 L 482 520 M 436 473 L 482 473 M 436 473 L 436 520 M 482 473 L 482 520 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hd__nor2_8.svg b/cells/nor2/sky130_fd_sc_hd__nor2_8.svg
index 87909e0..56271d8 100644
--- a/cells/nor2/sky130_fd_sc_hd__nor2_8.svg
+++ b/cells/nor2/sky130_fd_sc_hd__nor2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1574.5 631.5 L 1604.5 631.5 L 1604.5 763.5 L 1574.5 763.5 Z M 296.5 631.5 L 327.5 631.5 L 327.5 763.5 L 296.5 763.5 Z M 381.5 631.5 L 412.5 631.5 L 412.5 763.5 L 381.5 763.5 Z M 467.5 631.5 L 497.5 631.5 L 497.5 763.5 L 467.5 763.5 Z M 552.5 631.5 L 582.5 631.5 L 582.5 763.5 L 552.5 763.5 Z M 637.5 631.5 L 667.5 631.5 L 667.5 763.5 L 637.5 763.5 Z M 722.5 631.5 L 753.5 631.5 L 753.5 763.5 L 722.5 763.5 Z M 807.5 631.5 L 838.5 631.5 L 838.5 763.5 L 807.5 763.5 Z M 892.5 631.5 L 923.5 631.5 L 923.5 763.5 L 892.5 763.5 Z M 978.5 631.5 L 1008.5 631.5 L 1008.5 763.5 L 978.5 763.5 Z M 1063.5 631.5 L 1093.5 631.5 L 1093.5 763.5 L 1063.5 763.5 Z M 1148.5 631.5 L 1178.5 631.5 L 1178.5 763.5 L 1148.5 763.5 Z M 1233.5 631.5 L 1264.5 631.5 L 1264.5 763.5 L 1233.5 763.5 Z M 1318.5 631.5 L 1349.5 631.5 L 1349.5 763.5 L 1318.5 763.5 Z M 1403.5 631.5 L 1434.5 631.5 L 1434.5 763.5 L 1403.5 763.5 Z M 1489.5 631.5 L 1519.5 631.5 L 1519.5 763.5 L 1489.5 763.5 Z M 1489.5 631.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1574.5 307.5 L 1604.5 307.5 L 1604.5 510.5 L 1574.5 510.5 Z M 296.5 307.5 L 327.5 307.5 L 327.5 510.5 L 296.5 510.5 Z M 381.5 307.5 L 412.5 307.5 L 412.5 510.5 L 381.5 510.5 Z M 467.5 307.5 L 497.5 307.5 L 497.5 510.5 L 467.5 510.5 Z M 552.5 307.5 L 582.5 307.5 L 582.5 510.5 L 552.5 510.5 Z M 637.5 307.5 L 667.5 307.5 L 667.5 510.5 L 637.5 510.5 Z M 722.5 307.5 L 753.5 307.5 L 753.5 510.5 L 722.5 510.5 Z M 807.5 307.5 L 838.5 307.5 L 838.5 510.5 L 807.5 510.5 Z M 892.5 307.5 L 923.5 307.5 L 923.5 510.5 L 892.5 510.5 Z M 978.5 307.5 L 1008.5 307.5 L 1008.5 510.5 L 978.5 510.5 Z M 1063.5 307.5 L 1093.5 307.5 L 1093.5 510.5 L 1063.5 510.5 Z M 1148.5 307.5 L 1178.5 307.5 L 1178.5 510.5 L 1148.5 510.5 Z M 1233.5 307.5 L 1264.5 307.5 L 1264.5 510.5 L 1233.5 510.5 Z M 1318.5 307.5 L 1349.5 307.5 L 1349.5 510.5 L 1318.5 510.5 Z M 1403.5 307.5 L 1434.5 307.5 L 1434.5 510.5 L 1403.5 510.5 Z M 1489.5 307.5 L 1519.5 307.5 L 1519.5 510.5 L 1489.5 510.5 Z M 1489.5 307.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 242 837 L 276 837 M 242 802 L 276 802 M 242 802 L 242 837 M 276 802 L 276 837 " 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 242 837 L 276 837 M 242 802 L 276 802 M 276 837 L 276 802 M 242 837 L 242 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.svg b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.svg
index f28597b..bc533de 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_1.svg
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" 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="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1068.5 666.5 L 1109.5 666.5 L 1109.5 844.5 L 1068.5 844.5 Z M 820.5 729.5 L 861.5 729.5 L 861.5 844.5 L 820.5 844.5 Z M 953.5 666.5 L 994.5 666.5 L 994.5 844.5 L 953.5 844.5 Z M 953.5 666.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1068.5 228.5 L 1109.5 228.5 L 1109.5 502.5 L 1068.5 502.5 Z M 822.5 387.5 L 863.5 387.5 L 863.5 502.5 L 822.5 502.5 Z M 969.5 228.5 L 1010.5 228.5 L 1010.5 502.5 L 969.5 502.5 Z M 969.5 228.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 687 427 L 734 427 M 687 380 L 734 380 M 687 380 L 687 427 M 734 380 L 734 427 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.svg b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.svg
index c323386..6025ea9 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_2.svg
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" 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="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1237.5 666.5 L 1278.5 666.5 L 1278.5 781.5 L 1237.5 781.5 Z M 636.5 666.5 L 677.5 666.5 L 677.5 844.5 L 636.5 844.5 Z M 750.5 666.5 L 791.5 666.5 L 791.5 844.5 L 750.5 844.5 Z M 865.5 666.5 L 906.5 666.5 L 906.5 844.5 L 865.5 844.5 Z M 980.5 666.5 L 1021.5 666.5 L 1021.5 844.5 L 980.5 844.5 Z M 980.5 666.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1237.5 228.5 L 1278.5 228.5 L 1278.5 343.5 L 1237.5 343.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 750.5 228.5 L 791.5 228.5 L 791.5 502.5 L 750.5 502.5 Z M 865.5 228.5 L 906.5 228.5 L 906.5 502.5 L 865.5 502.5 Z M 980.5 228.5 L 1021.5 228.5 L 1021.5 502.5 L 980.5 502.5 Z M 980.5 228.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1318 613 L 1365 613 M 1318 566 L 1365 566 M 1318 566 L 1318 613 M 1365 566 L 1365 613 M 1318 706 L 1365 706 M 1318 659 L 1365 659 M 1318 659 L 1318 706 M 1365 659 L 1365 706 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.svg b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.svg
index 5c783b4..2b11382 100644
--- a/cells/nor2b/sky130_fd_sc_hd__nor2b_4.svg
+++ b/cells/nor2b/sky130_fd_sc_hd__nor2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 309.5 885.5 L 355.5 885.5 L 355.5 931.5 L 309.5 931.5 Z M 309.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1451.5 666.5 L 1492.5 666.5 L 1492.5 844.5 L 1451.5 844.5 Z M 381.5 666.5 L 422.5 666.5 L 422.5 844.5 L 381.5 844.5 Z M 496.5 666.5 L 537.5 666.5 L 537.5 844.5 L 496.5 844.5 Z M 611.5 666.5 L 652.5 666.5 L 652.5 844.5 L 611.5 844.5 Z M 726.5 666.5 L 767.5 666.5 L 767.5 844.5 L 726.5 844.5 Z M 841.5 666.5 L 882.5 666.5 L 882.5 844.5 L 841.5 844.5 Z M 956.5 666.5 L 997.5 666.5 L 997.5 844.5 L 956.5 844.5 Z M 1070.5 666.5 L 1111.5 666.5 L 1111.5 844.5 L 1070.5 844.5 Z M 1185.5 666.5 L 1226.5 666.5 L 1226.5 844.5 L 1185.5 844.5 Z M 1185.5 666.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1451.5 228.5 L 1492.5 228.5 L 1492.5 502.5 L 1451.5 502.5 Z M 381.5 228.5 L 422.5 228.5 L 422.5 502.5 L 381.5 502.5 Z M 496.5 228.5 L 537.5 228.5 L 537.5 502.5 L 496.5 502.5 Z M 611.5 228.5 L 652.5 228.5 L 652.5 502.5 L 611.5 502.5 Z M 726.5 228.5 L 767.5 228.5 L 767.5 502.5 L 726.5 502.5 Z M 841.5 228.5 L 882.5 228.5 L 882.5 502.5 L 841.5 502.5 Z M 956.5 228.5 L 997.5 228.5 L 997.5 502.5 L 956.5 502.5 Z M 1070.5 228.5 L 1111.5 228.5 L 1111.5 502.5 L 1070.5 502.5 Z M 1185.5 228.5 L 1226.5 228.5 L 1226.5 502.5 L 1185.5 502.5 Z M 1185.5 228.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image285" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 309 938 L 355 938 M 309 892 L 355 892 M 309 892 L 309 938 M 355 892 L 355 938 " 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 309 938 L 355 938 M 309 892 L 355 892 M 355 938 L 355 892 M 309 938 L 309 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_1.svg b/cells/nor3/sky130_fd_sc_hd__nor3_1.svg
index 9d3c6ec..e6e3fe4 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_1.svg
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image303" 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="#image276"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 753.5 885.5 L 800.5 885.5 L 800.5 931.5 L 753.5 931.5 Z M 753.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1050.5 666.5 L 1091.5 666.5 L 1091.5 844.5 L 1050.5 844.5 Z M 820.5 666.5 L 861.5 666.5 L 861.5 844.5 L 820.5 844.5 Z M 935.5 666.5 L 976.5 666.5 L 976.5 844.5 L 935.5 844.5 Z M 935.5 666.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1050.5 228.5 L 1091.5 228.5 L 1091.5 502.5 L 1050.5 502.5 Z M 820.5 228.5 L 861.5 228.5 L 861.5 502.5 L 820.5 502.5 Z M 935.5 228.5 L 976.5 228.5 L 976.5 502.5 L 935.5 502.5 Z M 935.5 228.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 753 938 L 800 938 M 753 892 L 800 892 M 753 892 L 753 938 M 800 892 L 800 938 " 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 753 938 L 800 938 M 753 892 L 800 892 M 800 938 L 800 892 M 753 938 L 753 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 879 706 L 925 706 M 879 659 L 925 659 M 879 659 L 879 706 M 925 659 L 925 706 M 1131 613 L 1177 613 M 1131 566 L 1177 566 M 1131 566 L 1131 613 M 1177 566 L 1177 613 M 1131 520 L 1177 520 M 1131 473 L 1177 473 M 1131 473 L 1131 520 M 1177 473 L 1177 520 M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_2.svg b/cells/nor3/sky130_fd_sc_hd__nor3_2.svg
index 12ab5dc..baba360 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_2.svg
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1293.5 666.5 L 1334.5 666.5 L 1334.5 844.5 L 1293.5 844.5 Z M 571.5 666.5 L 612.5 666.5 L 612.5 844.5 L 571.5 844.5 Z M 686.5 666.5 L 727.5 666.5 L 727.5 844.5 L 686.5 844.5 Z M 801.5 666.5 L 842.5 666.5 L 842.5 844.5 L 801.5 844.5 Z M 916.5 666.5 L 957.5 666.5 L 957.5 844.5 L 916.5 844.5 Z M 1178.5 666.5 L 1220.5 666.5 L 1220.5 844.5 L 1178.5 844.5 Z M 1178.5 666.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1293.5 228.5 L 1334.5 228.5 L 1334.5 502.5 L 1293.5 502.5 Z M 571.5 228.5 L 612.5 228.5 L 612.5 502.5 L 571.5 502.5 Z M 686.5 228.5 L 727.5 228.5 L 727.5 502.5 L 686.5 502.5 Z M 801.5 228.5 L 842.5 228.5 L 842.5 502.5 L 801.5 502.5 Z M 916.5 228.5 L 957.5 228.5 L 957.5 502.5 L 916.5 502.5 Z M 1178.5 228.5 L 1220.5 228.5 L 1220.5 502.5 L 1178.5 502.5 Z M 1178.5 228.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 499 520 L 545 520 M 499 473 L 545 473 M 499 473 L 499 520 M 545 473 L 545 520 M 1002 520 L 1049 520 M 1002 473 L 1049 473 M 1002 473 L 1002 520 M 1049 473 L 1049 520 M 1133 613 L 1180 613 M 1133 566 L 1180 566 M 1133 566 L 1133 613 M 1180 566 L 1180 613 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hd__nor3_4.svg b/cells/nor3/sky130_fd_sc_hd__nor3_4.svg
index 4e33dd2..af8998e 100644
--- a/cells/nor3/sky130_fd_sc_hd__nor3_4.svg
+++ b/cells/nor3/sky130_fd_sc_hd__nor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1463.5 653.5 L 1500.5 653.5 L 1500.5 813.5 L 1463.5 813.5 Z M 324.5 653.5 L 361.5 653.5 L 361.5 813.5 L 324.5 813.5 Z M 428.5 653.5 L 465.5 653.5 L 465.5 813.5 L 428.5 813.5 Z M 531.5 653.5 L 568.5 653.5 L 568.5 813.5 L 531.5 813.5 Z M 635.5 653.5 L 672.5 653.5 L 672.5 813.5 L 635.5 813.5 Z M 738.5 653.5 L 775.5 653.5 L 775.5 813.5 L 738.5 813.5 Z M 842.5 653.5 L 879.5 653.5 L 879.5 813.5 L 842.5 813.5 Z M 946.5 653.5 L 983.5 653.5 L 983.5 813.5 L 946.5 813.5 Z M 1049.5 653.5 L 1086.5 653.5 L 1086.5 813.5 L 1049.5 813.5 Z M 1153.5 653.5 L 1190.5 653.5 L 1190.5 813.5 L 1153.5 813.5 Z M 1256.5 653.5 L 1293.5 653.5 L 1293.5 813.5 L 1256.5 813.5 Z M 1360.5 653.5 L 1397.5 653.5 L 1397.5 813.5 L 1360.5 813.5 Z M 1360.5 653.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1463.5 258.5 L 1500.5 258.5 L 1500.5 505.5 L 1463.5 505.5 Z M 324.5 258.5 L 361.5 258.5 L 361.5 505.5 L 324.5 505.5 Z M 428.5 258.5 L 465.5 258.5 L 465.5 505.5 L 428.5 505.5 Z M 531.5 258.5 L 568.5 258.5 L 568.5 505.5 L 531.5 505.5 Z M 635.5 258.5 L 672.5 258.5 L 672.5 505.5 L 635.5 505.5 Z M 738.5 258.5 L 775.5 258.5 L 775.5 505.5 L 738.5 505.5 Z M 842.5 258.5 L 879.5 258.5 L 879.5 505.5 L 842.5 505.5 Z M 946.5 258.5 L 983.5 258.5 L 983.5 505.5 L 946.5 505.5 Z M 1049.5 258.5 L 1086.5 258.5 L 1086.5 505.5 L 1049.5 505.5 Z M 1153.5 258.5 L 1190.5 258.5 L 1190.5 505.5 L 1153.5 505.5 Z M 1256.5 258.5 L 1293.5 258.5 L 1293.5 505.5 L 1256.5 505.5 Z M 1360.5 258.5 L 1397.5 258.5 L 1397.5 505.5 L 1360.5 505.5 Z M 1360.5 258.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 1505.5 305.5 L 1547.5 305.5 L 1547.5 325.5 L 1505.5 325.5 Z M 1505.5 325.5 L 1547.5 325.5 L 1547.5 347.5 L 1505.5 347.5 Z M 825.5 305.5 L 867.5 305.5 L 867.5 347.5 L 825.5 347.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.svg b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.svg
index f35e84d..afe6a92 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_1.svg
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1127.5 666.5 L 1168.5 666.5 L 1168.5 781.5 L 1127.5 781.5 Z M 764.5 666.5 L 805.5 666.5 L 805.5 844.5 L 764.5 844.5 Z M 879.5 666.5 L 920.5 666.5 L 920.5 844.5 L 879.5 844.5 Z M 994.5 666.5 L 1035.5 666.5 L 1035.5 844.5 L 994.5 844.5 Z M 994.5 666.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1127.5 342.5 L 1168.5 342.5 L 1168.5 457.5 L 1127.5 457.5 Z M 879.5 228.5 L 920.5 228.5 L 920.5 502.5 L 879.5 502.5 Z M 994.5 228.5 L 1035.5 228.5 L 1035.5 502.5 L 994.5 502.5 Z M 764.5 228.5 L 805.5 228.5 L 805.5 502.5 L 764.5 502.5 Z M 764.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 625 938 L 671 938 M 625 892 L 671 892 M 625 892 L 625 938 M 671 892 L 671 938 " 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 625 938 L 671 938 M 625 892 L 671 892 M 671 938 L 671 892 M 625 938 L 625 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 625 613 L 671 613 M 625 566 L 671 566 M 625 566 L 625 613 M 671 566 L 671 613 M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.svg b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.svg
index 3ac5b42..757f0ff 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_2.svg
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1440.5 666.5 L 1481.5 666.5 L 1481.5 781.5 L 1440.5 781.5 Z M 444.5 666.5 L 485.5 666.5 L 485.5 844.5 L 444.5 844.5 Z M 559.5 666.5 L 600.5 666.5 L 600.5 844.5 L 559.5 844.5 Z M 674.5 666.5 L 715.5 666.5 L 715.5 844.5 L 674.5 844.5 Z M 789.5 666.5 L 830.5 666.5 L 830.5 844.5 L 789.5 844.5 Z M 1057.5 666.5 L 1098.5 666.5 L 1098.5 844.5 L 1057.5 844.5 Z M 1172.5 666.5 L 1213.5 666.5 L 1213.5 844.5 L 1172.5 844.5 Z M 1172.5 666.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 444.5 228.5 L 485.5 228.5 L 485.5 502.5 L 444.5 502.5 Z M 1440.5 387.5 L 1481.5 387.5 L 1481.5 502.5 L 1440.5 502.5 Z M 1172.5 228.5 L 1213.5 228.5 L 1213.5 502.5 L 1172.5 502.5 Z M 1057.5 228.5 L 1098.5 228.5 L 1098.5 502.5 L 1057.5 502.5 Z M 789.5 228.5 L 830.5 228.5 L 830.5 502.5 L 789.5 502.5 Z M 674.5 228.5 L 715.5 228.5 L 715.5 502.5 L 674.5 502.5 Z M 559.5 228.5 L 600.5 228.5 L 600.5 502.5 L 559.5 502.5 Z M 559.5 228.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 372 520 L 418 520 M 372 473 L 418 473 M 372 473 L 372 520 M 418 473 L 418 520 M 875 520 L 921 520 M 875 473 L 921 473 M 875 473 L 875 520 M 921 473 L 921 520 M 1006 520 L 1053 520 M 1006 473 L 1053 473 M 1006 473 L 1006 520 M 1053 473 L 1053 520 M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.svg b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.svg
index 5feba31..0982bf8 100644
--- a/cells/nor3b/sky130_fd_sc_hd__nor3b_4.svg
+++ b/cells/nor3b/sky130_fd_sc_hd__nor3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 248.5 810.5 L 284.5 810.5 L 284.5 847.5 L 248.5 847.5 Z M 248.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1503.5 638.5 L 1536.5 638.5 L 1536.5 778.5 L 1503.5 778.5 Z M 305.5 638.5 L 337.5 638.5 L 337.5 778.5 L 305.5 778.5 Z M 395.5 638.5 L 428.5 638.5 L 428.5 778.5 L 395.5 778.5 Z M 486.5 638.5 L 518.5 638.5 L 518.5 778.5 L 486.5 778.5 Z M 576.5 638.5 L 609.5 638.5 L 609.5 778.5 L 576.5 778.5 Z M 667.5 638.5 L 699.5 638.5 L 699.5 778.5 L 667.5 778.5 Z M 870.5 638.5 L 902.5 638.5 L 902.5 778.5 L 870.5 778.5 Z M 960.5 638.5 L 992.5 638.5 L 992.5 778.5 L 960.5 778.5 Z M 1051.5 638.5 L 1083.5 638.5 L 1083.5 778.5 L 1051.5 778.5 Z M 1141.5 638.5 L 1173.5 638.5 L 1173.5 778.5 L 1141.5 778.5 Z M 1232.5 638.5 L 1264.5 638.5 L 1264.5 778.5 L 1232.5 778.5 Z M 1322.5 638.5 L 1354.5 638.5 L 1354.5 778.5 L 1322.5 778.5 Z M 1413.5 638.5 L 1445.5 638.5 L 1445.5 778.5 L 1413.5 778.5 Z M 1413.5 638.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1503.5 293.5 L 1536.5 293.5 L 1536.5 508.5 L 1503.5 508.5 Z M 305.5 293.5 L 337.5 293.5 L 337.5 508.5 L 305.5 508.5 Z M 395.5 293.5 L 428.5 293.5 L 428.5 508.5 L 395.5 508.5 Z M 486.5 293.5 L 518.5 293.5 L 518.5 508.5 L 486.5 508.5 Z M 576.5 293.5 L 609.5 293.5 L 609.5 508.5 L 576.5 508.5 Z M 667.5 293.5 L 699.5 293.5 L 699.5 508.5 L 667.5 508.5 Z M 870.5 293.5 L 902.5 293.5 L 902.5 508.5 L 870.5 508.5 Z M 960.5 293.5 L 992.5 293.5 L 992.5 508.5 L 960.5 508.5 Z M 1051.5 293.5 L 1083.5 293.5 L 1083.5 508.5 L 1051.5 508.5 Z M 1141.5 293.5 L 1173.5 293.5 L 1173.5 508.5 L 1141.5 508.5 Z M 1232.5 293.5 L 1264.5 293.5 L 1264.5 508.5 L 1232.5 508.5 Z M 1322.5 293.5 L 1354.5 293.5 L 1354.5 508.5 L 1322.5 508.5 Z M 1413.5 293.5 L 1445.5 293.5 L 1445.5 508.5 L 1413.5 508.5 Z M 1413.5 293.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <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 248 855 L 284 855 M 248 819 L 284 819 M 248 819 L 248 855 M 284 819 L 284 855 " 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 248 855 L 284 855 M 248 819 L 284 819 M 284 855 L 284 819 M 248 855 L 248 819 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_1.svg b/cells/nor4/sky130_fd_sc_hd__nor4_1.svg
index ae1496a..3511482 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_1.svg
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 897.5 666.5 L 938.5 666.5 L 938.5 844.5 L 897.5 844.5 Z M 1013.5 666.5 L 1054.5 666.5 L 1054.5 844.5 L 1013.5 844.5 Z M 1013.5 666.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1128.5 228.5 L 1169.5 228.5 L 1169.5 502.5 L 1128.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 868.5 228.5 L 909.5 228.5 L 909.5 502.5 L 868.5 502.5 Z M 1013.5 228.5 L 1054.5 228.5 L 1054.5 502.5 L 1013.5 502.5 Z M 1013.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_2.svg b/cells/nor4/sky130_fd_sc_hd__nor4_2.svg
index 0aeaf0d..89f9469 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_2.svg
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" 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="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1401.5 666.5 L 1442.5 666.5 L 1442.5 844.5 L 1401.5 844.5 Z M 444.5 666.5 L 485.5 666.5 L 485.5 844.5 L 444.5 844.5 Z M 559.5 666.5 L 600.5 666.5 L 600.5 844.5 L 559.5 844.5 Z M 674.5 666.5 L 715.5 666.5 L 715.5 844.5 L 674.5 844.5 Z M 789.5 666.5 L 830.5 666.5 L 830.5 844.5 L 789.5 844.5 Z M 1057.5 666.5 L 1098.5 666.5 L 1098.5 844.5 L 1057.5 844.5 Z M 1172.5 666.5 L 1213.5 666.5 L 1213.5 844.5 L 1172.5 844.5 Z M 1287.5 666.5 L 1328.5 666.5 L 1328.5 844.5 L 1287.5 844.5 Z M 1287.5 666.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1401.5 228.5 L 1442.5 228.5 L 1442.5 502.5 L 1401.5 502.5 Z M 444.5 228.5 L 485.5 228.5 L 485.5 502.5 L 444.5 502.5 Z M 559.5 228.5 L 600.5 228.5 L 600.5 502.5 L 559.5 502.5 Z M 674.5 228.5 L 715.5 228.5 L 715.5 502.5 L 674.5 502.5 Z M 789.5 228.5 L 830.5 228.5 L 830.5 502.5 L 789.5 502.5 Z M 1057.5 228.5 L 1098.5 228.5 L 1098.5 502.5 L 1057.5 502.5 Z M 1172.5 228.5 L 1213.5 228.5 L 1213.5 502.5 L 1172.5 502.5 Z M 1287.5 228.5 L 1328.5 228.5 L 1328.5 502.5 L 1287.5 502.5 Z M 1287.5 228.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hd__nor4_4.svg b/cells/nor4/sky130_fd_sc_hd__nor4_4.svg
index f7575b1..64d5b55 100644
--- a/cells/nor4/sky130_fd_sc_hd__nor4_4.svg
+++ b/cells/nor4/sky130_fd_sc_hd__nor4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" 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="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1595.5 626.5 L 1624.5 626.5 L 1624.5 750.5 L 1595.5 750.5 Z M 290.5 626.5 L 319.5 626.5 L 319.5 750.5 L 290.5 750.5 Z M 370.5 626.5 L 399.5 626.5 L 399.5 750.5 L 370.5 750.5 Z M 451.5 626.5 L 480.5 626.5 L 480.5 750.5 L 451.5 750.5 Z M 531.5 626.5 L 560.5 626.5 L 560.5 750.5 L 531.5 750.5 Z M 612.5 626.5 L 640.5 626.5 L 640.5 750.5 L 612.5 750.5 Z M 692.5 626.5 L 721.5 626.5 L 721.5 750.5 L 692.5 750.5 Z M 772.5 626.5 L 801.5 626.5 L 801.5 750.5 L 772.5 750.5 Z M 853.5 626.5 L 881.5 626.5 L 881.5 750.5 L 853.5 750.5 Z M 1033.5 626.5 L 1061.5 626.5 L 1061.5 750.5 L 1033.5 750.5 Z M 1113.5 626.5 L 1142.5 626.5 L 1142.5 750.5 L 1113.5 750.5 Z M 1193.5 626.5 L 1222.5 626.5 L 1222.5 750.5 L 1193.5 750.5 Z M 1274.5 626.5 L 1302.5 626.5 L 1302.5 750.5 L 1274.5 750.5 Z M 1354.5 626.5 L 1383.5 626.5 L 1383.5 750.5 L 1354.5 750.5 Z M 1434.5 626.5 L 1463.5 626.5 L 1463.5 750.5 L 1434.5 750.5 Z M 1515.5 626.5 L 1543.5 626.5 L 1543.5 750.5 L 1515.5 750.5 Z M 1515.5 626.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1595.5 320.5 L 1624.5 320.5 L 1624.5 511.5 L 1595.5 511.5 Z M 290.5 320.5 L 319.5 320.5 L 319.5 511.5 L 290.5 511.5 Z M 370.5 320.5 L 399.5 320.5 L 399.5 511.5 L 370.5 511.5 Z M 451.5 320.5 L 480.5 320.5 L 480.5 511.5 L 451.5 511.5 Z M 531.5 320.5 L 560.5 320.5 L 560.5 511.5 L 531.5 511.5 Z M 612.5 320.5 L 640.5 320.5 L 640.5 511.5 L 612.5 511.5 Z M 692.5 320.5 L 721.5 320.5 L 721.5 511.5 L 692.5 511.5 Z M 772.5 320.5 L 801.5 320.5 L 801.5 511.5 L 772.5 511.5 Z M 853.5 320.5 L 881.5 320.5 L 881.5 511.5 L 853.5 511.5 Z M 1033.5 320.5 L 1061.5 320.5 L 1061.5 511.5 L 1033.5 511.5 Z M 1113.5 320.5 L 1142.5 320.5 L 1142.5 511.5 L 1113.5 511.5 Z M 1193.5 320.5 L 1222.5 320.5 L 1222.5 511.5 L 1193.5 511.5 Z M 1274.5 320.5 L 1302.5 320.5 L 1302.5 511.5 L 1274.5 511.5 Z M 1354.5 320.5 L 1383.5 320.5 L 1383.5 511.5 L 1354.5 511.5 Z M 1434.5 320.5 L 1463.5 320.5 L 1463.5 511.5 L 1434.5 511.5 Z M 1515.5 320.5 L 1543.5 320.5 L 1543.5 511.5 L 1515.5 511.5 Z M 1515.5 320.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.svg b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.svg
index af2d455..ec19ae2 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_1.svg
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1195.5 666.5 L 1236.5 666.5 L 1236.5 781.5 L 1195.5 781.5 Z M 701.5 666.5 L 742.5 666.5 L 742.5 844.5 L 701.5 844.5 Z M 816.5 666.5 L 857.5 666.5 L 857.5 844.5 L 816.5 844.5 Z M 947.5 666.5 L 988.5 666.5 L 988.5 844.5 L 947.5 844.5 Z M 1062.5 666.5 L 1103.5 666.5 L 1103.5 844.5 L 1062.5 844.5 Z M 1062.5 666.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1195.5 334.5 L 1236.5 334.5 L 1236.5 449.5 L 1195.5 449.5 Z M 816.5 228.5 L 857.5 228.5 L 857.5 502.5 L 816.5 502.5 Z M 1062.5 228.5 L 1103.5 228.5 L 1103.5 502.5 L 1062.5 502.5 Z M 947.5 228.5 L 988.5 228.5 L 988.5 502.5 L 947.5 502.5 Z M 701.5 228.5 L 742.5 228.5 L 742.5 502.5 L 701.5 502.5 Z M 701.5 228.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.svg b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.svg
index a806bd1..1abf7b7 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_2.svg
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" 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="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1510.5 662.5 L 1550.5 662.5 L 1550.5 774.5 L 1510.5 774.5 Z M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 443.5 662.5 L 482.5 662.5 L 482.5 835.5 L 443.5 835.5 Z M 554.5 662.5 L 594.5 662.5 L 594.5 835.5 L 554.5 835.5 Z M 666.5 662.5 L 706.5 662.5 L 706.5 835.5 L 666.5 835.5 Z M 925.5 662.5 L 965.5 662.5 L 965.5 835.5 L 925.5 835.5 Z M 1037.5 662.5 L 1077.5 662.5 L 1077.5 835.5 L 1037.5 835.5 Z M 1149.5 662.5 L 1189.5 662.5 L 1189.5 835.5 L 1149.5 835.5 Z M 1260.5 662.5 L 1300.5 662.5 L 1300.5 835.5 L 1260.5 835.5 Z M 1260.5 662.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1510.5 237.5 L 1550.5 237.5 L 1550.5 348.5 L 1510.5 348.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 443.5 237.5 L 482.5 237.5 L 482.5 503.5 L 443.5 503.5 Z M 554.5 237.5 L 594.5 237.5 L 594.5 503.5 L 554.5 503.5 Z M 666.5 237.5 L 706.5 237.5 L 706.5 503.5 L 666.5 503.5 Z M 925.5 237.5 L 965.5 237.5 L 965.5 503.5 L 925.5 503.5 Z M 1037.5 237.5 L 1077.5 237.5 L 1077.5 503.5 L 1037.5 503.5 Z M 1149.5 237.5 L 1189.5 237.5 L 1189.5 503.5 L 1149.5 503.5 Z M 1260.5 237.5 L 1300.5 237.5 L 1300.5 503.5 L 1260.5 503.5 Z M 1260.5 237.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 260 520 L 306 520 M 260 475 L 306 475 M 260 475 L 260 520 M 306 475 L 306 520 M 505 520 L 550 520 M 505 475 L 550 475 M 505 475 L 505 520 M 550 475 L 550 520 M 750 520 L 795 520 M 750 475 L 795 475 M 750 475 L 750 520 M 795 475 L 795 520 M 876 520 L 921 520 M 876 475 L 921 475 M 876 475 L 876 520 M 921 475 L 921 520 M 1121 520 L 1166 520 M 1121 475 L 1166 475 M 1121 475 L 1121 520 M 1166 475 L 1166 520 M 1243 520 L 1288 520 M 1243 475 L 1288 475 M 1243 475 L 1243 520 M 1288 475 L 1288 520 M 1610 611 L 1655 611 M 1610 566 L 1655 566 M 1610 566 L 1610 611 M 1655 566 L 1655 611 M 1610 701 L 1655 701 M 1610 656 L 1655 656 M 1610 656 L 1610 701 M 1655 656 L 1655 701 M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.svg b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.svg
index b872841..739c743 100644
--- a/cells/nor4b/sky130_fd_sc_hd__nor4b_4.svg
+++ b/cells/nor4b/sky130_fd_sc_hd__nor4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 232.5 754.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1610.5 616.5 L 1636.5 616.5 L 1636.5 728.5 L 1610.5 728.5 Z M 275.5 616.5 L 301.5 616.5 L 301.5 728.5 L 275.5 728.5 Z M 347.5 616.5 L 373.5 616.5 L 373.5 728.5 L 347.5 728.5 Z M 419.5 616.5 L 445.5 616.5 L 445.5 728.5 L 419.5 728.5 Z M 492.5 616.5 L 517.5 616.5 L 517.5 728.5 L 492.5 728.5 Z M 564.5 616.5 L 590.5 616.5 L 590.5 728.5 L 564.5 728.5 Z M 636.5 616.5 L 662.5 616.5 L 662.5 728.5 L 636.5 728.5 Z M 708.5 616.5 L 734.5 616.5 L 734.5 728.5 L 708.5 728.5 Z M 781.5 616.5 L 806.5 616.5 L 806.5 728.5 L 781.5 728.5 Z M 942.5 616.5 L 968.5 616.5 L 968.5 728.5 L 942.5 728.5 Z M 1015.5 616.5 L 1040.5 616.5 L 1040.5 728.5 L 1015.5 728.5 Z M 1087.5 616.5 L 1113.5 616.5 L 1113.5 728.5 L 1087.5 728.5 Z M 1159.5 616.5 L 1185.5 616.5 L 1185.5 728.5 L 1159.5 728.5 Z M 1232.5 616.5 L 1257.5 616.5 L 1257.5 728.5 L 1232.5 728.5 Z M 1304.5 616.5 L 1330.5 616.5 L 1330.5 728.5 L 1304.5 728.5 Z M 1376.5 616.5 L 1402.5 616.5 L 1402.5 728.5 L 1376.5 728.5 Z M 1448.5 616.5 L 1474.5 616.5 L 1474.5 728.5 L 1448.5 728.5 Z M 1448.5 616.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 341.5 L 1636.5 341.5 L 1636.5 513.5 L 1610.5 513.5 Z M 275.5 341.5 L 301.5 341.5 L 301.5 513.5 L 275.5 513.5 Z M 347.5 341.5 L 373.5 341.5 L 373.5 513.5 L 347.5 513.5 Z M 419.5 341.5 L 445.5 341.5 L 445.5 513.5 L 419.5 513.5 Z M 492.5 341.5 L 517.5 341.5 L 517.5 513.5 L 492.5 513.5 Z M 564.5 341.5 L 590.5 341.5 L 590.5 513.5 L 564.5 513.5 Z M 636.5 341.5 L 662.5 341.5 L 662.5 513.5 L 636.5 513.5 Z M 708.5 341.5 L 734.5 341.5 L 734.5 513.5 L 708.5 513.5 Z M 781.5 341.5 L 806.5 341.5 L 806.5 513.5 L 781.5 513.5 Z M 942.5 341.5 L 968.5 341.5 L 968.5 513.5 L 942.5 513.5 Z M 1015.5 341.5 L 1040.5 341.5 L 1040.5 513.5 L 1015.5 513.5 Z M 1087.5 341.5 L 1113.5 341.5 L 1113.5 513.5 L 1087.5 513.5 Z M 1159.5 341.5 L 1185.5 341.5 L 1185.5 513.5 L 1159.5 513.5 Z M 1232.5 341.5 L 1257.5 341.5 L 1257.5 513.5 L 1232.5 513.5 Z M 1304.5 341.5 L 1330.5 341.5 L 1330.5 513.5 L 1304.5 513.5 Z M 1376.5 341.5 L 1402.5 341.5 L 1402.5 513.5 L 1376.5 513.5 Z M 1448.5 341.5 L 1474.5 341.5 L 1474.5 513.5 L 1448.5 513.5 Z M 1448.5 341.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 232 793 L 261 793 M 232 764 L 261 764 M 232 764 L 232 793 M 261 764 L 261 793 " 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 232 793 L 261 793 M 232 764 L 261 764 M 261 793 L 261 764 M 232 793 L 232 764 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.svg b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.svg
index 8936d6a..409051b 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.svg
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" 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="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 697.5 666.5 L 738.5 666.5 L 738.5 781.5 L 697.5 781.5 Z M 577.5 666.5 L 618.5 666.5 L 618.5 781.5 L 577.5 781.5 Z M 1200.5 666.5 L 1241.5 666.5 L 1241.5 844.5 L 1200.5 844.5 Z M 954.5 666.5 L 995.5 666.5 L 995.5 844.5 L 954.5 844.5 Z M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1315.5 666.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 232.5 L 607.5 232.5 L 607.5 347.5 L 566.5 347.5 Z M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 698.5 387.5 L 739.5 387.5 L 739.5 502.5 L 698.5 502.5 Z M 1069.5 228.5 L 1110.5 228.5 L 1110.5 502.5 L 1069.5 502.5 Z M 954.5 228.5 L 995.5 228.5 L 995.5 502.5 L 954.5 502.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 502.5 L 1200.5 502.5 Z M 1200.5 228.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.svg b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.svg
index 542ebce..dc9dac1 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.svg
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 433.5 653.5 L 470.5 653.5 L 470.5 756.5 L 433.5 756.5 Z M 329.5 653.5 L 366.5 653.5 L 366.5 756.5 L 329.5 756.5 Z M 1248.5 653.5 L 1285.5 653.5 L 1285.5 813.5 L 1248.5 813.5 Z M 700.5 653.5 L 737.5 653.5 L 737.5 813.5 L 700.5 813.5 Z M 804.5 653.5 L 841.5 653.5 L 841.5 813.5 L 804.5 813.5 Z M 907.5 653.5 L 944.5 653.5 L 944.5 813.5 L 907.5 813.5 Z M 1558.5 653.5 L 1595.5 653.5 L 1595.5 813.5 L 1558.5 813.5 Z M 1455.5 653.5 L 1492.5 653.5 L 1492.5 813.5 L 1455.5 813.5 Z M 1351.5 653.5 L 1388.5 653.5 L 1388.5 813.5 L 1351.5 813.5 Z M 1011.5 653.5 L 1048.5 653.5 L 1048.5 813.5 L 1011.5 813.5 Z M 1011.5 653.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 319.5 262.5 L 356.5 262.5 L 356.5 366.5 L 319.5 366.5 Z M 804.5 258.5 L 841.5 258.5 L 841.5 505.5 L 804.5 505.5 Z M 439.5 401.5 L 476.5 401.5 L 476.5 505.5 L 439.5 505.5 Z M 1558.5 258.5 L 1595.5 258.5 L 1595.5 505.5 L 1558.5 505.5 Z M 1248.5 258.5 L 1285.5 258.5 L 1285.5 505.5 L 1248.5 505.5 Z M 1011.5 258.5 L 1048.5 258.5 L 1048.5 505.5 L 1011.5 505.5 Z M 907.5 258.5 L 944.5 258.5 L 944.5 505.5 L 907.5 505.5 Z M 1455.5 258.5 L 1492.5 258.5 L 1492.5 505.5 L 1455.5 505.5 Z M 700.5 258.5 L 737.5 258.5 L 737.5 505.5 L 700.5 505.5 Z M 1351.5 258.5 L 1388.5 258.5 L 1388.5 505.5 L 1351.5 505.5 Z M 1351.5 258.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 372 606 L 414 606 M 372 564 L 414 564 M 372 564 L 372 606 M 414 564 L 414 606 M 1165 606 L 1207 606 M 1165 564 L 1207 564 M 1165 564 L 1165 606 M 1207 564 L 1207 606 M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.svg b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.svg
index 500754d..deca55f 100644
--- a/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.svg
+++ b/cells/nor4bb/sky130_fd_sc_hd__nor4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 230.5 743.5 L 258.5 743.5 L 258.5 771.5 L 230.5 771.5 Z M 230.5 743.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1620.5 612.5 L 1645.5 612.5 L 1645.5 719.5 L 1620.5 719.5 Z M 273.5 612.5 L 298.5 612.5 L 298.5 719.5 L 273.5 719.5 Z M 342.5 612.5 L 367.5 612.5 L 367.5 719.5 L 342.5 719.5 Z M 503.5 612.5 L 527.5 612.5 L 527.5 719.5 L 503.5 719.5 Z M 572.5 612.5 L 596.5 612.5 L 596.5 719.5 L 572.5 719.5 Z M 640.5 612.5 L 665.5 612.5 L 665.5 719.5 L 640.5 719.5 Z M 709.5 612.5 L 734.5 612.5 L 734.5 719.5 L 709.5 719.5 Z M 778.5 612.5 L 803.5 612.5 L 803.5 719.5 L 778.5 719.5 Z M 847.5 612.5 L 871.5 612.5 L 871.5 719.5 L 847.5 719.5 Z M 916.5 612.5 L 940.5 612.5 L 940.5 719.5 L 916.5 719.5 Z M 985.5 612.5 L 1009.5 612.5 L 1009.5 719.5 L 985.5 719.5 Z M 1139.5 612.5 L 1163.5 612.5 L 1163.5 719.5 L 1139.5 719.5 Z M 1207.5 612.5 L 1232.5 612.5 L 1232.5 719.5 L 1207.5 719.5 Z M 1276.5 612.5 L 1301.5 612.5 L 1301.5 719.5 L 1276.5 719.5 Z M 1345.5 612.5 L 1370.5 612.5 L 1370.5 719.5 L 1345.5 719.5 Z M 1414.5 612.5 L 1438.5 612.5 L 1438.5 719.5 L 1414.5 719.5 Z M 1483.5 612.5 L 1507.5 612.5 L 1507.5 719.5 L 1483.5 719.5 Z M 1551.5 612.5 L 1576.5 612.5 L 1576.5 719.5 L 1551.5 719.5 Z M 1551.5 612.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1620.5 350.5 L 1645.5 350.5 L 1645.5 514.5 L 1620.5 514.5 Z M 273.5 350.5 L 298.5 350.5 L 298.5 514.5 L 273.5 514.5 Z M 342.5 350.5 L 367.5 350.5 L 367.5 514.5 L 342.5 514.5 Z M 503.5 350.5 L 527.5 350.5 L 527.5 514.5 L 503.5 514.5 Z M 572.5 350.5 L 596.5 350.5 L 596.5 514.5 L 572.5 514.5 Z M 640.5 350.5 L 665.5 350.5 L 665.5 514.5 L 640.5 514.5 Z M 709.5 350.5 L 734.5 350.5 L 734.5 514.5 L 709.5 514.5 Z M 778.5 350.5 L 803.5 350.5 L 803.5 514.5 L 778.5 514.5 Z M 847.5 350.5 L 871.5 350.5 L 871.5 514.5 L 847.5 514.5 Z M 916.5 350.5 L 940.5 350.5 L 940.5 514.5 L 916.5 514.5 Z M 985.5 350.5 L 1009.5 350.5 L 1009.5 514.5 L 985.5 514.5 Z M 1139.5 350.5 L 1163.5 350.5 L 1163.5 514.5 L 1139.5 514.5 Z M 1207.5 350.5 L 1232.5 350.5 L 1232.5 514.5 L 1207.5 514.5 Z M 1276.5 350.5 L 1301.5 350.5 L 1301.5 514.5 L 1276.5 514.5 Z M 1345.5 350.5 L 1370.5 350.5 L 1370.5 514.5 L 1345.5 514.5 Z M 1414.5 350.5 L 1438.5 350.5 L 1438.5 514.5 L 1414.5 514.5 Z M 1483.5 350.5 L 1507.5 350.5 L 1507.5 514.5 L 1483.5 514.5 Z M 1551.5 350.5 L 1576.5 350.5 L 1576.5 514.5 L 1551.5 514.5 Z M 1551.5 350.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 230 781 L 258 781 M 230 753 L 258 753 M 258 781 L 258 753 M 230 781 L 230 753 " transform="matrix(1,0,0,-1,0.5,1079.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 206.84375 601.921875 L 206.84375 724.09375 L 270.359375 660.574219 L 300.972656 660.574219 L 248.902344 712.363281 L 310.128906 810.5 L 280.660156 810.5 L 230.015625 729.242188 L 206.84375 752.132812 L 206.84375 810.5 L 183.09375 810.5 L 183.09375 601.921875 Z M 206.84375 601.921875 "/>
 <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 237 368 L 237 375 M 233 372 L 240 372 M 205 319 L 205 324 M 202 322 L 207 322 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.svg b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.svg
index 108b760..1d65dfe 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_1.svg
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" 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="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1377.5 666.5 L 1418.5 666.5 L 1418.5 844.5 L 1377.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 772.5 666.5 L 813.5 666.5 L 813.5 844.5 L 772.5 844.5 Z M 913.5 666.5 L 954.5 666.5 L 954.5 844.5 L 913.5 844.5 Z M 1054.5 666.5 L 1095.5 666.5 L 1095.5 844.5 L 1054.5 844.5 Z M 1262.5 666.5 L 1303.5 666.5 L 1303.5 844.5 L 1262.5 844.5 Z M 1262.5 666.5 "/>
 </clipPath>
-<image id="image331" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1377.5 228.5 L 1418.5 228.5 L 1418.5 502.5 L 1377.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 753.5 228.5 L 794.5 228.5 L 794.5 502.5 L 753.5 502.5 Z M 913.5 228.5 L 954.5 228.5 L 954.5 502.5 L 913.5 502.5 Z M 1121.5 228.5 L 1162.5 228.5 L 1162.5 502.5 L 1121.5 502.5 Z M 1278.5 228.5 L 1319.5 228.5 L 1319.5 502.5 L 1278.5 502.5 Z M 1278.5 228.5 "/>
 </clipPath>
-<image id="image332" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image333" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface327">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -184,6 +184,5 @@
 <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 434 194 L 481 194 M 434 148 L 481 148 M 434 148 L 434 194 M 481 148 L 481 194 " 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 434 194 L 481 194 M 434 148 L 481 148 M 481 194 L 481 148 M 434 194 L 434 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1064 427 L 1110 427 M 1064 380 L 1110 380 M 1064 380 L 1064 427 M 1110 380 L 1110 427 M 1315 613 L 1362 613 M 1315 566 L 1362 566 M 1315 566 L 1315 613 M 1362 566 L 1362 613 M 1064 334 L 1110 334 M 1064 287 L 1110 287 M 1064 287 L 1064 334 M 1110 287 L 1110 334 M 815 427 L 861 427 M 815 380 L 861 380 M 815 380 L 815 427 M 861 380 L 861 427 M 815 334 L 861 334 M 815 287 L 861 287 M 815 287 L 815 334 M 861 287 L 861 334 M 1315 706 L 1362 706 M 1315 659 L 1362 659 M 1315 659 L 1315 706 M 1362 659 L 1362 706 M 1315 799 L 1362 799 M 1315 752 L 1362 752 M 1315 752 L 1315 799 M 1362 752 L 1362 799 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.svg b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.svg
index 45110ab..3640916 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_2.svg
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1359.5 666.5 L 1400.5 666.5 L 1400.5 844.5 L 1359.5 844.5 Z M 440.5 666.5 L 481.5 666.5 L 481.5 844.5 L 440.5 844.5 Z M 558.5 666.5 L 599.5 666.5 L 599.5 844.5 L 558.5 844.5 Z M 817.5 666.5 L 858.5 666.5 L 858.5 844.5 L 817.5 844.5 Z M 916.5 666.5 L 957.5 666.5 L 957.5 844.5 L 916.5 844.5 Z M 1064.5 666.5 L 1105.5 666.5 L 1105.5 844.5 L 1064.5 844.5 Z M 1211.5 666.5 L 1252.5 666.5 L 1252.5 844.5 L 1211.5 844.5 Z M 1211.5 666.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1359.5 228.5 L 1400.5 228.5 L 1400.5 502.5 L 1359.5 502.5 Z M 440.5 228.5 L 481.5 228.5 L 481.5 502.5 L 440.5 502.5 Z M 558.5 228.5 L 599.5 228.5 L 599.5 502.5 L 558.5 502.5 Z M 798.5 228.5 L 839.5 228.5 L 839.5 502.5 L 798.5 502.5 Z M 916.5 228.5 L 957.5 228.5 L 957.5 502.5 L 916.5 502.5 Z M 1064.5 228.5 L 1105.5 228.5 L 1105.5 502.5 L 1064.5 502.5 Z M 1211.5 228.5 L 1252.5 228.5 L 1252.5 502.5 L 1211.5 502.5 Z M 1211.5 228.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 755 613 L 801 613 M 755 566 L 801 566 M 755 566 L 755 613 M 801 566 L 801 613 M 880 427 L 927 427 M 880 380 L 927 380 M 880 380 L 880 427 M 927 380 L 927 427 M 880 613 L 927 613 M 880 566 L 927 566 M 880 566 L 880 613 M 927 566 L 927 613 M 1132 613 L 1178 613 M 1132 566 L 1178 566 M 1132 566 L 1132 613 M 1178 566 L 1178 613 M 880 520 L 927 520 M 880 473 L 927 473 M 880 473 L 880 520 M 927 473 L 927 520 M 1509 706 L 1556 706 M 1509 659 L 1556 659 M 1509 659 L 1509 706 M 1556 659 L 1556 706 M 1509 799 L 1556 799 M 1509 752 L 1556 752 M 1509 752 L 1509 799 M 1556 752 L 1556 799 M 1509 613 L 1556 613 M 1509 566 L 1556 566 M 1509 566 L 1509 613 M 1556 566 L 1556 613 M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.svg b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.svg
index 5199112..2cc6806 100644
--- a/cells/o2111a/sky130_fd_sc_hd__o2111a_4.svg
+++ b/cells/o2111a/sky130_fd_sc_hd__o2111a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1590.5 631.5 L 1620.5 631.5 L 1620.5 763.5 L 1590.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 706.5 631.5 L 736.5 631.5 L 736.5 763.5 L 706.5 763.5 Z M 904.5 631.5 L 934.5 631.5 L 934.5 763.5 L 904.5 763.5 Z M 998.5 631.5 L 1028.5 631.5 L 1028.5 763.5 L 998.5 763.5 Z M 1083.5 631.5 L 1114.5 631.5 L 1114.5 763.5 L 1083.5 763.5 Z M 1189.5 631.5 L 1219.5 631.5 L 1219.5 763.5 L 1189.5 763.5 Z M 1309.5 631.5 L 1340.5 631.5 L 1340.5 763.5 L 1309.5 763.5 Z M 1412.5 631.5 L 1442.5 631.5 L 1442.5 763.5 L 1412.5 763.5 Z M 1500.5 631.5 L 1530.5 631.5 L 1530.5 763.5 L 1500.5 763.5 Z M 1500.5 631.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 872.5 307.5 L 903.5 307.5 L 903.5 510.5 L 872.5 510.5 Z M 958.5 307.5 L 989.5 307.5 L 989.5 510.5 L 958.5 510.5 Z M 1046.5 307.5 L 1076.5 307.5 L 1076.5 510.5 L 1046.5 510.5 Z M 1148.5 307.5 L 1178.5 307.5 L 1178.5 510.5 L 1148.5 510.5 Z M 1339.5 307.5 L 1369.5 307.5 L 1369.5 510.5 L 1339.5 510.5 Z M 1424.5 307.5 L 1454.5 307.5 L 1454.5 510.5 L 1424.5 510.5 Z M 1509.5 307.5 L 1539.5 307.5 L 1539.5 510.5 L 1509.5 510.5 Z M 1509.5 307.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,5 @@
 <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 242 285 L 276 285 M 242 251 L 276 251 M 242 251 L 242 285 M 276 251 L 276 285 " 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 242 285 L 276 285 M 242 251 L 276 251 M 276 285 L 276 251 M 242 285 L 242 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 242 596 L 276 596 M 242 561 L 276 561 M 242 561 L 242 596 M 276 561 L 276 596 M 708 596 L 742 596 M 708 561 L 742 561 M 708 561 L 708 596 M 742 561 L 742 596 M 895 596 L 929 596 M 895 561 L 929 561 M 895 561 L 895 596 M 929 561 L 929 596 M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.svg b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.svg
index 8482dd8..2c915ea 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.svg
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1250.5 666.5 L 1291.5 666.5 L 1291.5 844.5 L 1250.5 844.5 Z M 704.5 666.5 L 745.5 666.5 L 745.5 844.5 L 704.5 844.5 Z M 802.5 666.5 L 843.5 666.5 L 843.5 844.5 L 802.5 844.5 Z M 950.5 666.5 L 991.5 666.5 L 991.5 844.5 L 950.5 844.5 Z M 1102.5 666.5 L 1143.5 666.5 L 1143.5 844.5 L 1102.5 844.5 Z M 1102.5 666.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1250.5 228.5 L 1291.5 228.5 L 1291.5 502.5 L 1250.5 502.5 Z M 685.5 228.5 L 726.5 228.5 L 726.5 502.5 L 685.5 502.5 Z M 802.5 228.5 L 843.5 228.5 L 843.5 502.5 L 802.5 502.5 Z M 950.5 228.5 L 991.5 228.5 L 991.5 502.5 L 950.5 502.5 Z M 1102.5 228.5 L 1143.5 228.5 L 1143.5 502.5 L 1102.5 502.5 Z M 1102.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1191 799 L 1237 799 M 1191 752 L 1237 752 M 1191 752 L 1191 799 M 1237 752 L 1237 799 M 1065 613 L 1111 613 M 1065 566 L 1111 566 M 1065 566 L 1065 613 M 1111 566 L 1111 613 M 562 706 L 608 706 M 562 659 L 608 659 M 562 659 L 562 706 M 608 659 L 608 706 M 813 613 L 860 613 M 813 566 L 860 566 M 813 566 L 813 613 M 860 566 L 860 613 M 687 613 L 734 613 M 687 566 L 734 566 M 687 566 L 687 613 M 734 566 L 734 613 M 939 613 L 986 613 M 939 566 L 986 566 M 939 566 L 939 613 M 986 566 L 986 613 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.svg b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.svg
index 1e9d656..e7cd3c5 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.svg
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <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="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1530.5 662.5 L 1570.5 662.5 L 1570.5 835.5 L 1530.5 835.5 Z M 353.5 662.5 L 393.5 662.5 L 393.5 835.5 L 353.5 835.5 Z M 468.5 662.5 L 508.5 662.5 L 508.5 835.5 L 468.5 835.5 Z M 582.5 662.5 L 622.5 662.5 L 622.5 835.5 L 582.5 835.5 Z M 697.5 662.5 L 736.5 662.5 L 736.5 835.5 L 697.5 835.5 Z M 959.5 662.5 L 998.5 662.5 L 998.5 835.5 L 959.5 835.5 Z M 1073.5 662.5 L 1113.5 662.5 L 1113.5 835.5 L 1073.5 835.5 Z M 1187.5 662.5 L 1227.5 662.5 L 1227.5 835.5 L 1187.5 835.5 Z M 1302.5 662.5 L 1342.5 662.5 L 1342.5 835.5 L 1302.5 835.5 Z M 1416.5 662.5 L 1456.5 662.5 L 1456.5 835.5 L 1416.5 835.5 Z M 1416.5 662.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1530.5 237.5 L 1570.5 237.5 L 1570.5 503.5 L 1530.5 503.5 Z M 353.5 237.5 L 393.5 237.5 L 393.5 503.5 L 353.5 503.5 Z M 468.5 237.5 L 508.5 237.5 L 508.5 503.5 L 468.5 503.5 Z M 582.5 237.5 L 622.5 237.5 L 622.5 503.5 L 582.5 503.5 Z M 697.5 237.5 L 736.5 237.5 L 736.5 503.5 L 697.5 503.5 Z M 811.5 237.5 L 851.5 237.5 L 851.5 503.5 L 811.5 503.5 Z M 925.5 237.5 L 965.5 237.5 L 965.5 503.5 L 925.5 503.5 Z M 1187.5 237.5 L 1227.5 237.5 L 1227.5 503.5 L 1187.5 503.5 Z M 1302.5 237.5 L 1342.5 237.5 L 1342.5 503.5 L 1302.5 503.5 Z M 1416.5 237.5 L 1456.5 237.5 L 1456.5 503.5 L 1416.5 503.5 Z M 1416.5 237.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <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 264 204 L 310 204 M 264 159 L 310 159 M 264 159 L 264 204 M 310 159 L 310 204 " 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 264 204 L 310 204 M 264 159 L 310 159 M 310 204 L 310 159 M 264 204 L 264 159 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1365 520 L 1411 520 M 1365 475 L 1411 475 M 1365 475 L 1365 520 M 1411 475 L 1411 520 M 509 520 L 554 520 M 509 475 L 554 475 M 509 475 L 509 520 M 554 475 L 554 520 M 1121 520 L 1166 520 M 1121 475 L 1166 475 M 1121 475 L 1121 520 M 1166 475 L 1166 520 M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.svg b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.svg
index 249a4c1..3c842fb 100644
--- a/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.svg
+++ b/cells/o2111ai/sky130_fd_sc_hd__o2111ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image418" 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="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1605.5 609.5 L 1629.5 609.5 L 1629.5 710.5 L 1605.5 710.5 Z M 265.5 609.5 L 289.5 609.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 609.5 L 354.5 609.5 L 354.5 710.5 L 331.5 710.5 Z M 397.5 609.5 L 420.5 609.5 L 420.5 710.5 L 397.5 710.5 Z M 462.5 609.5 L 486.5 609.5 L 486.5 710.5 L 462.5 710.5 Z M 528.5 609.5 L 551.5 609.5 L 551.5 710.5 L 528.5 710.5 Z M 594.5 609.5 L 617.5 609.5 L 617.5 710.5 L 594.5 710.5 Z M 659.5 609.5 L 683.5 609.5 L 683.5 710.5 L 659.5 710.5 Z M 725.5 609.5 L 748.5 609.5 L 748.5 710.5 L 725.5 710.5 Z M 872.5 609.5 L 895.5 609.5 L 895.5 710.5 L 872.5 710.5 Z M 938.5 609.5 L 961.5 609.5 L 961.5 710.5 L 938.5 710.5 Z M 1003.5 609.5 L 1027.5 609.5 L 1027.5 710.5 L 1003.5 710.5 Z M 1069.5 609.5 L 1092.5 609.5 L 1092.5 710.5 L 1069.5 710.5 Z M 1138.5 609.5 L 1162.5 609.5 L 1162.5 710.5 L 1138.5 710.5 Z M 1204.5 609.5 L 1228.5 609.5 L 1228.5 710.5 L 1204.5 710.5 Z M 1273.5 609.5 L 1296.5 609.5 L 1296.5 710.5 L 1273.5 710.5 Z M 1339.5 609.5 L 1362.5 609.5 L 1362.5 710.5 L 1339.5 710.5 Z M 1408.5 609.5 L 1432.5 609.5 L 1432.5 710.5 L 1408.5 710.5 Z M 1474.5 609.5 L 1497.5 609.5 L 1497.5 710.5 L 1474.5 710.5 Z M 1540.5 609.5 L 1563.5 609.5 L 1563.5 710.5 L 1540.5 710.5 Z M 1540.5 609.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1629.5 358.5 L 1652.5 358.5 L 1652.5 515.5 L 1629.5 515.5 Z M 265.5 358.5 L 289.5 358.5 L 289.5 515.5 L 265.5 515.5 Z M 331.5 358.5 L 354.5 358.5 L 354.5 515.5 L 331.5 515.5 Z M 397.5 358.5 L 420.5 358.5 L 420.5 515.5 L 397.5 515.5 Z M 462.5 358.5 L 486.5 358.5 L 486.5 515.5 L 462.5 515.5 Z M 528.5 358.5 L 551.5 358.5 L 551.5 515.5 L 528.5 515.5 Z M 594.5 358.5 L 617.5 358.5 L 617.5 515.5 L 594.5 515.5 Z M 659.5 358.5 L 683.5 358.5 L 683.5 515.5 L 659.5 515.5 Z M 725.5 358.5 L 748.5 358.5 L 748.5 515.5 L 725.5 515.5 Z M 823.5 358.5 L 846.5 358.5 L 846.5 515.5 L 823.5 515.5 Z M 888.5 358.5 L 912.5 358.5 L 912.5 515.5 L 888.5 515.5 Z M 954.5 358.5 L 977.5 358.5 L 977.5 515.5 L 954.5 515.5 Z M 1020.5 358.5 L 1043.5 358.5 L 1043.5 515.5 L 1020.5 515.5 Z M 1089.5 358.5 L 1113.5 358.5 L 1113.5 515.5 L 1089.5 515.5 Z M 1155.5 358.5 L 1178.5 358.5 L 1178.5 515.5 L 1155.5 515.5 Z M 1221.5 358.5 L 1244.5 358.5 L 1244.5 515.5 L 1221.5 515.5 Z M 1286.5 358.5 L 1310.5 358.5 L 1310.5 515.5 L 1286.5 515.5 Z M 1432.5 358.5 L 1455.5 358.5 L 1455.5 515.5 L 1432.5 515.5 Z M 1497.5 358.5 L 1521.5 358.5 L 1521.5 515.5 L 1497.5 515.5 Z M 1563.5 358.5 L 1586.5 358.5 L 1586.5 515.5 L 1563.5 515.5 Z M 1563.5 358.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface386">
+<g id="surface415">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -221,6 +221,5 @@
 <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 227 771 L 253 771 M 227 744 L 253 744 M 227 744 L 227 771 M 253 744 L 253 771 " 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 227 771 L 253 771 M 227 744 L 253 744 M 253 771 L 253 744 M 227 771 L 227 744 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_1.svg b/cells/o211a/sky130_fd_sc_hd__o211a_1.svg
index db61079..00ffe66 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_1.svg
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1251.5 666.5 L 1292.5 666.5 L 1292.5 844.5 L 1251.5 844.5 Z M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 823.5 666.5 L 864.5 666.5 L 864.5 844.5 L 823.5 844.5 Z M 953.5 666.5 L 994.5 666.5 L 994.5 844.5 L 953.5 844.5 Z M 1114.5 666.5 L 1155.5 666.5 L 1155.5 844.5 L 1114.5 844.5 Z M 1114.5 666.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1251.5 228.5 L 1292.5 228.5 L 1292.5 502.5 L 1251.5 502.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 823.5 228.5 L 864.5 228.5 L 864.5 502.5 L 823.5 502.5 Z M 953.5 228.5 L 994.5 228.5 L 994.5 502.5 L 953.5 502.5 Z M 1114.5 228.5 L 1155.5 228.5 L 1155.5 502.5 L 1114.5 502.5 Z M 1114.5 228.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,5 @@
 <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 499 938 L 545 938 M 499 892 L 545 892 M 499 892 L 499 938 M 545 892 L 545 938 " 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 499 938 L 545 938 M 499 892 L 545 892 M 545 938 L 545 892 M 499 938 L 499 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_2.svg b/cells/o211a/sky130_fd_sc_hd__o211a_2.svg
index db48ae8..c047276 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_2.svg
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1285.5 666.5 L 1326.5 666.5 L 1326.5 844.5 L 1285.5 844.5 Z M 567.5 666.5 L 608.5 666.5 L 608.5 844.5 L 567.5 844.5 Z M 666.5 666.5 L 707.5 666.5 L 707.5 844.5 L 666.5 844.5 Z M 921.5 666.5 L 962.5 666.5 L 962.5 844.5 L 921.5 844.5 Z M 1039.5 666.5 L 1080.5 666.5 L 1080.5 844.5 L 1039.5 844.5 Z M 1168.5 666.5 L 1209.5 666.5 L 1209.5 844.5 L 1168.5 844.5 Z M 1168.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1291.5 228.5 L 1332.5 228.5 L 1332.5 502.5 L 1291.5 502.5 Z M 567.5 228.5 L 608.5 228.5 L 608.5 502.5 L 567.5 502.5 Z M 685.5 228.5 L 726.5 228.5 L 726.5 502.5 L 685.5 502.5 Z M 927.5 228.5 L 968.5 228.5 L 968.5 502.5 L 927.5 502.5 Z M 1025.5 228.5 L 1066.5 228.5 L 1066.5 502.5 L 1025.5 502.5 Z M 1173.5 228.5 L 1214.5 228.5 L 1214.5 502.5 L 1173.5 502.5 Z M 1173.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hd__o211a_4.svg b/cells/o211a/sky130_fd_sc_hd__o211a_4.svg
index 69e2136..ea29f9c 100644
--- a/cells/o211a/sky130_fd_sc_hd__o211a_4.svg
+++ b/cells/o211a/sky130_fd_sc_hd__o211a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 251.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1573.5 645.5 L 1607.5 645.5 L 1607.5 794.5 L 1573.5 794.5 Z M 309.5 645.5 L 343.5 645.5 L 343.5 794.5 L 309.5 794.5 Z M 405.5 645.5 L 440.5 645.5 L 440.5 794.5 L 405.5 794.5 Z M 502.5 645.5 L 536.5 645.5 L 536.5 794.5 L 502.5 794.5 Z M 598.5 645.5 L 633.5 645.5 L 633.5 794.5 L 598.5 794.5 Z M 824.5 645.5 L 858.5 645.5 L 858.5 794.5 L 824.5 794.5 Z M 907.5 645.5 L 941.5 645.5 L 941.5 794.5 L 907.5 794.5 Z M 1044.5 645.5 L 1078.5 645.5 L 1078.5 794.5 L 1044.5 794.5 Z M 1142.5 645.5 L 1177.5 645.5 L 1177.5 794.5 L 1142.5 794.5 Z M 1251.5 645.5 L 1285.5 645.5 L 1285.5 794.5 L 1251.5 794.5 Z M 1375.5 645.5 L 1409.5 645.5 L 1409.5 794.5 L 1375.5 794.5 Z M 1474.5 645.5 L 1508.5 645.5 L 1508.5 794.5 L 1474.5 794.5 Z M 1474.5 645.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1573.5 277.5 L 1607.5 277.5 L 1607.5 507.5 L 1573.5 507.5 Z M 398.5 277.5 L 433.5 277.5 L 433.5 507.5 L 398.5 507.5 Z M 497.5 277.5 L 532.5 277.5 L 532.5 507.5 L 497.5 507.5 Z M 596.5 277.5 L 631.5 277.5 L 631.5 507.5 L 596.5 507.5 Z M 695.5 277.5 L 730.5 277.5 L 730.5 507.5 L 695.5 507.5 Z M 794.5 277.5 L 828.5 277.5 L 828.5 507.5 L 794.5 507.5 Z M 945.5 277.5 L 979.5 277.5 L 979.5 507.5 L 945.5 507.5 Z M 1044.5 277.5 L 1078.5 277.5 L 1078.5 507.5 L 1044.5 507.5 Z M 1168.5 277.5 L 1202.5 277.5 L 1202.5 507.5 L 1168.5 507.5 Z M 1276.5 277.5 L 1310.5 277.5 L 1310.5 507.5 L 1276.5 507.5 Z M 1375.5 277.5 L 1409.5 277.5 L 1409.5 507.5 L 1375.5 507.5 Z M 1474.5 277.5 L 1508.5 277.5 L 1508.5 507.5 L 1474.5 507.5 Z M 1474.5 277.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 251 876 L 290 876 M 251 837 L 290 837 M 251 837 L 251 876 M 290 837 L 290 876 " 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 251 876 L 290 876 M 251 837 L 290 837 M 290 876 L 290 837 M 251 876 L 251 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.svg b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.svg
index d3fd0ae..8568483 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_1.svg
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1088.5 666.5 L 1129.5 666.5 L 1129.5 844.5 L 1088.5 844.5 Z M 694.5 666.5 L 735.5 666.5 L 735.5 844.5 L 694.5 844.5 Z M 842.5 666.5 L 883.5 666.5 L 883.5 844.5 L 842.5 844.5 Z M 990.5 666.5 L 1031.5 666.5 L 1031.5 844.5 L 990.5 844.5 Z M 990.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1088.5 228.5 L 1129.5 228.5 L 1129.5 502.5 L 1088.5 502.5 Z M 694.5 228.5 L 735.5 228.5 L 735.5 502.5 L 694.5 502.5 Z M 793.5 228.5 L 834.5 228.5 L 834.5 502.5 L 793.5 502.5 Z M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 941.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image295" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 625 938 L 671 938 M 625 892 L 671 892 M 625 892 L 625 938 M 671 892 L 671 938 " 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 625 938 L 671 938 M 625 892 L 671 892 M 671 938 L 671 892 M 625 938 L 625 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1002 613 L 1049 613 M 1002 566 L 1049 566 M 1002 566 L 1002 613 M 1049 566 L 1049 613 M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.svg b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.svg
index 23c415b..1fdc6ab 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_2.svg
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 370.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1422.5 666.5 L 1463.5 666.5 L 1463.5 844.5 L 1422.5 844.5 Z M 445.5 666.5 L 486.5 666.5 L 486.5 844.5 L 445.5 844.5 Z M 563.5 666.5 L 604.5 666.5 L 604.5 844.5 L 563.5 844.5 Z M 681.5 666.5 L 722.5 666.5 L 722.5 844.5 L 681.5 844.5 Z M 798.5 666.5 L 839.5 666.5 L 839.5 844.5 L 798.5 844.5 Z M 1069.5 666.5 L 1110.5 666.5 L 1110.5 844.5 L 1069.5 844.5 Z M 1187.5 666.5 L 1228.5 666.5 L 1228.5 844.5 L 1187.5 844.5 Z M 1304.5 666.5 L 1345.5 666.5 L 1345.5 844.5 L 1304.5 844.5 Z M 1304.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1422.5 228.5 L 1463.5 228.5 L 1463.5 502.5 L 1422.5 502.5 Z M 445.5 228.5 L 486.5 228.5 L 486.5 502.5 L 445.5 502.5 Z M 563.5 228.5 L 604.5 228.5 L 604.5 502.5 L 563.5 502.5 Z M 681.5 228.5 L 722.5 228.5 L 722.5 502.5 L 681.5 502.5 Z M 798.5 228.5 L 839.5 228.5 L 839.5 502.5 L 798.5 502.5 Z M 1069.5 228.5 L 1110.5 228.5 L 1110.5 502.5 L 1069.5 502.5 Z M 1187.5 228.5 L 1228.5 228.5 L 1228.5 502.5 L 1187.5 502.5 Z M 1304.5 228.5 L 1345.5 228.5 L 1345.5 502.5 L 1304.5 502.5 Z M 1304.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image295" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 370 938 L 417 938 M 370 892 L 417 892 M 370 892 L 370 938 M 417 892 L 417 938 " 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 370 938 L 417 938 M 370 892 L 417 892 M 417 938 L 417 892 M 370 938 L 370 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.svg b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.svg
index 84d0e71..7b6976f 100644
--- a/cells/o211ai/sky130_fd_sc_hd__o211ai_4.svg
+++ b/cells/o211ai/sky130_fd_sc_hd__o211ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1529.5 626.5 L 1558.5 626.5 L 1558.5 750.5 L 1529.5 750.5 Z M 287.5 626.5 L 316.5 626.5 L 316.5 750.5 L 287.5 750.5 Z M 370.5 626.5 L 398.5 626.5 L 398.5 750.5 L 370.5 750.5 Z M 452.5 626.5 L 481.5 626.5 L 481.5 750.5 L 452.5 750.5 Z M 534.5 626.5 L 563.5 626.5 L 563.5 750.5 L 534.5 750.5 Z M 616.5 626.5 L 645.5 626.5 L 645.5 750.5 L 616.5 750.5 Z M 699.5 626.5 L 727.5 626.5 L 727.5 750.5 L 699.5 750.5 Z M 781.5 626.5 L 810.5 626.5 L 810.5 750.5 L 781.5 750.5 Z M 865.5 626.5 L 894.5 626.5 L 894.5 750.5 L 865.5 750.5 Z M 953.5 626.5 L 982.5 626.5 L 982.5 750.5 L 953.5 750.5 Z M 1035.5 626.5 L 1064.5 626.5 L 1064.5 750.5 L 1035.5 750.5 Z M 1118.5 626.5 L 1146.5 626.5 L 1146.5 750.5 L 1118.5 750.5 Z M 1198.5 626.5 L 1227.5 626.5 L 1227.5 750.5 L 1198.5 750.5 Z M 1278.5 626.5 L 1307.5 626.5 L 1307.5 750.5 L 1278.5 750.5 Z M 1359.5 626.5 L 1387.5 626.5 L 1387.5 750.5 L 1359.5 750.5 Z M 1439.5 626.5 L 1468.5 626.5 L 1468.5 750.5 L 1439.5 750.5 Z M 1439.5 626.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1519.5 320.5 L 1548.5 320.5 L 1548.5 511.5 L 1519.5 511.5 Z M 287.5 320.5 L 316.5 320.5 L 316.5 511.5 L 287.5 511.5 Z M 370.5 320.5 L 398.5 320.5 L 398.5 511.5 L 370.5 511.5 Z M 452.5 320.5 L 481.5 320.5 L 481.5 511.5 L 452.5 511.5 Z M 534.5 320.5 L 563.5 320.5 L 563.5 511.5 L 534.5 511.5 Z M 616.5 320.5 L 645.5 320.5 L 645.5 511.5 L 616.5 511.5 Z M 699.5 320.5 L 727.5 320.5 L 727.5 511.5 L 699.5 511.5 Z M 781.5 320.5 L 810.5 320.5 L 810.5 511.5 L 781.5 511.5 Z M 863.5 320.5 L 892.5 320.5 L 892.5 511.5 L 863.5 511.5 Z M 953.5 320.5 L 982.5 320.5 L 982.5 511.5 L 953.5 511.5 Z M 1035.5 320.5 L 1064.5 320.5 L 1064.5 511.5 L 1035.5 511.5 Z M 1118.5 320.5 L 1146.5 320.5 L 1146.5 511.5 L 1118.5 511.5 Z M 1198.5 320.5 L 1227.5 320.5 L 1227.5 511.5 L 1198.5 511.5 Z M 1278.5 320.5 L 1307.5 320.5 L 1307.5 511.5 L 1278.5 511.5 Z M 1359.5 320.5 L 1387.5 320.5 L 1387.5 511.5 L 1359.5 511.5 Z M 1439.5 320.5 L 1468.5 320.5 L 1468.5 511.5 L 1439.5 511.5 Z M 1439.5 320.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 415.5 681.5 L 448.5 681.5 L 448.5 714.5 L 415.5 714.5 Z M 1648.5 681.5 L 1680.5 681.5 L 1680.5 714.5 L 1648.5 714.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_1.svg b/cells/o21a/sky130_fd_sc_hd__o21a_1.svg
index fea1aec..cc8a6bd 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_1.svg
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1191.5 666.5 L 1232.5 666.5 L 1232.5 844.5 L 1191.5 844.5 Z M 693.5 666.5 L 734.5 666.5 L 734.5 844.5 L 693.5 844.5 Z M 950.5 666.5 L 991.5 666.5 L 991.5 844.5 L 950.5 844.5 Z M 1076.5 666.5 L 1117.5 666.5 L 1117.5 844.5 L 1076.5 844.5 Z M 1076.5 666.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1191.5 228.5 L 1232.5 228.5 L 1232.5 502.5 L 1191.5 502.5 Z M 698.5 228.5 L 739.5 228.5 L 739.5 502.5 L 698.5 502.5 Z M 919.5 228.5 L 960.5 228.5 L 960.5 502.5 L 919.5 502.5 Z M 1066.5 228.5 L 1107.5 228.5 L 1107.5 502.5 L 1066.5 502.5 Z M 1066.5 228.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 625 938 L 671 938 M 625 892 L 671 892 M 625 892 L 625 938 M 671 892 L 671 938 " 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 625 938 L 671 938 M 625 892 L 671 892 M 671 938 L 671 892 M 625 938 L 625 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_2.svg b/cells/o21a/sky130_fd_sc_hd__o21a_2.svg
index 4e020ab..9039aec 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_2.svg
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <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="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1252.5 666.5 L 1293.5 666.5 L 1293.5 844.5 L 1252.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 746.5 666.5 L 787.5 666.5 L 787.5 844.5 L 746.5 844.5 Z M 1006.5 666.5 L 1047.5 666.5 L 1047.5 844.5 L 1006.5 844.5 Z M 1124.5 666.5 L 1165.5 666.5 L 1165.5 844.5 L 1124.5 844.5 Z M 1124.5 666.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1252.5 228.5 L 1293.5 228.5 L 1293.5 502.5 L 1252.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 746.5 228.5 L 787.5 228.5 L 787.5 502.5 L 746.5 502.5 Z M 1006.5 228.5 L 1047.5 228.5 L 1047.5 502.5 L 1006.5 502.5 Z M 1124.5 228.5 L 1165.5 228.5 L 1165.5 502.5 L 1124.5 502.5 Z M 1124.5 228.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hd__o21a_4.svg b/cells/o21a/sky130_fd_sc_hd__o21a_4.svg
index 7f2457c..8e625e1 100644
--- a/cells/o21a/sky130_fd_sc_hd__o21a_4.svg
+++ b/cells/o21a/sky130_fd_sc_hd__o21a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image315" 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="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <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="#image315"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1542.5 662.5 L 1582.5 662.5 L 1582.5 835.5 L 1542.5 835.5 Z M 332.5 662.5 L 372.5 662.5 L 372.5 835.5 L 332.5 835.5 Z M 447.5 662.5 L 486.5 662.5 L 486.5 835.5 L 447.5 835.5 Z M 561.5 662.5 L 601.5 662.5 L 601.5 835.5 L 561.5 835.5 Z M 675.5 662.5 L 715.5 662.5 L 715.5 835.5 L 675.5 835.5 Z M 928.5 662.5 L 968.5 662.5 L 968.5 835.5 L 928.5 835.5 Z M 1042.5 662.5 L 1082.5 662.5 L 1082.5 835.5 L 1042.5 835.5 Z M 1178.5 662.5 L 1218.5 662.5 L 1218.5 835.5 L 1178.5 835.5 Z M 1314.5 662.5 L 1353.5 662.5 L 1353.5 835.5 L 1314.5 835.5 Z M 1428.5 662.5 L 1468.5 662.5 L 1468.5 835.5 L 1428.5 835.5 Z M 1428.5 662.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image316"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1542.5 237.5 L 1582.5 237.5 L 1582.5 503.5 L 1542.5 503.5 Z M 417.5 237.5 L 457.5 237.5 L 457.5 503.5 L 417.5 503.5 Z M 532.5 237.5 L 572.5 237.5 L 572.5 503.5 L 532.5 503.5 Z M 646.5 237.5 L 686.5 237.5 L 686.5 503.5 L 646.5 503.5 Z M 760.5 237.5 L 800.5 237.5 L 800.5 503.5 L 760.5 503.5 Z M 880.5 237.5 L 920.5 237.5 L 920.5 503.5 L 880.5 503.5 Z M 994.5 237.5 L 1034.5 237.5 L 1034.5 503.5 L 994.5 503.5 Z M 1199.5 237.5 L 1239.5 237.5 L 1239.5 503.5 L 1199.5 503.5 Z M 1314.5 237.5 L 1353.5 237.5 L 1353.5 503.5 L 1314.5 503.5 Z M 1428.5 237.5 L 1468.5 237.5 L 1468.5 503.5 L 1428.5 503.5 Z M 1428.5 237.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 266 204 L 311 204 M 266 159 L 311 159 M 266 159 L 266 204 M 311 159 L 311 204 " 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 266 204 L 311 204 M 266 159 L 311 159 M 311 204 L 311 159 M 266 204 L 266 159 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.svg b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.svg
index 75ed877..f5ae83d 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_0.svg
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" 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="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 752.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1064.5 729.5 L 1105.5 729.5 L 1105.5 844.5 L 1064.5 844.5 Z M 828.5 729.5 L 869.5 729.5 L 869.5 844.5 L 828.5 844.5 Z M 946.5 729.5 L 987.5 729.5 L 987.5 844.5 L 946.5 844.5 Z M 946.5 729.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1060.5 228.5 L 1101.5 228.5 L 1101.5 403.5 L 1060.5 403.5 Z M 835.5 228.5 L 876.5 228.5 L 876.5 403.5 L 835.5 403.5 Z M 942.5 228.5 L 983.5 228.5 L 983.5 403.5 L 942.5 403.5 Z M 942.5 228.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 752 613 L 798 613 M 752 566 L 798 566 M 752 566 L 752 613 M 798 566 L 798 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 752 613 L 798 613 M 752 566 L 798 566 M 798 613 L 798 566 M 752 613 L 752 566 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.svg b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.svg
index d148bff..7386600 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_1.svg
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 660.5 112.5 L 1267.5 112.5 L 1267.5 551.5 L 660.5 551.5 Z M 660.5 112.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 753.5 885.5 L 800.5 885.5 L 800.5 931.5 L 753.5 931.5 Z M 753.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1066.5 666.5 L 1107.5 666.5 L 1107.5 844.5 L 1066.5 844.5 Z M 820.5 666.5 L 861.5 666.5 L 861.5 844.5 L 820.5 844.5 Z M 951.5 666.5 L 992.5 666.5 L 992.5 844.5 L 951.5 844.5 Z M 951.5 666.5 "/>
 </clipPath>
-<image id="image308" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1066.5 228.5 L 1107.5 228.5 L 1107.5 420.5 L 1066.5 420.5 Z M 820.5 228.5 L 861.5 228.5 L 861.5 502.5 L 820.5 502.5 Z M 919.5 228.5 L 960.5 228.5 L 960.5 502.5 L 919.5 502.5 Z M 919.5 228.5 "/>
 </clipPath>
-<image id="image309" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 752.5 141.5 L 798.5 141.5 L 798.5 187.5 L 752.5 187.5 Z M 1129.5 141.5 L 1176.5 141.5 L 1176.5 187.5 L 1129.5 187.5 Z M 1003.5 141.5 L 1050.5 141.5 L 1050.5 187.5 L 1003.5 187.5 Z M 878.5 141.5 L 924.5 141.5 L 924.5 187.5 L 878.5 187.5 Z M 752.5 885.5 L 798.5 885.5 L 798.5 931.5 L 752.5 931.5 Z M 1129.5 885.5 L 1176.5 885.5 L 1176.5 931.5 L 1129.5 931.5 Z M 1003.5 885.5 L 1050.5 885.5 L 1050.5 931.5 L 1003.5 931.5 Z M 878.5 885.5 L 924.5 885.5 L 924.5 931.5 L 878.5 931.5 Z M 878.5 885.5 "/>
 </clipPath>
-<image id="image310" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <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 753 194 L 800 194 M 753 148 L 800 148 M 753 148 L 753 194 M 800 148 L 800 194 " 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 753 194 L 800 194 M 753 148 L 800 148 M 800 194 L 800 148 M 753 194 L 753 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 712 167 L 712 174 M 708 171 L 715 171 " 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 712 166 L 712 175 M 707 171 L 716 171 M 711 172 L 713 172 M 711 170 L 713 170 M 711 170 L 711 172 M 713 170 L 713 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.svg b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.svg
index 1b38336..0eb07af 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_2.svg
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1252.5 666.5 L 1293.5 666.5 L 1293.5 844.5 L 1252.5 844.5 Z M 634.5 666.5 L 675.5 666.5 L 675.5 844.5 L 634.5 844.5 Z M 752.5 666.5 L 793.5 666.5 L 793.5 844.5 L 752.5 844.5 Z M 869.5 666.5 L 910.5 666.5 L 910.5 844.5 L 869.5 844.5 Z M 1017.5 666.5 L 1058.5 666.5 L 1058.5 844.5 L 1017.5 844.5 Z M 1135.5 666.5 L 1176.5 666.5 L 1176.5 844.5 L 1135.5 844.5 Z M 1135.5 666.5 "/>
 </clipPath>
-<image id="image308" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1252.5 228.5 L 1293.5 228.5 L 1293.5 502.5 L 1252.5 502.5 Z M 634.5 228.5 L 675.5 228.5 L 675.5 502.5 L 634.5 502.5 Z M 752.5 228.5 L 793.5 228.5 L 793.5 502.5 L 752.5 502.5 Z M 869.5 228.5 L 910.5 228.5 L 910.5 502.5 L 869.5 502.5 Z M 1006.5 228.5 L 1047.5 228.5 L 1047.5 502.5 L 1006.5 502.5 Z M 1135.5 228.5 L 1176.5 228.5 L 1176.5 502.5 L 1135.5 502.5 Z M 1135.5 228.5 "/>
 </clipPath>
-<image id="image309" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image310" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,5 @@
 <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 560 194 L 607 194 M 560 148 L 607 148 M 560 148 L 560 194 M 607 148 L 607 194 " 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 560 194 L 607 194 M 560 148 L 607 148 M 607 194 L 607 148 M 560 194 L 560 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.svg b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.svg
index bafa08e..446d602 100644
--- a/cells/o21ai/sky130_fd_sc_hd__o21ai_4.svg
+++ b/cells/o21ai/sky130_fd_sc_hd__o21ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" 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="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1503.5 653.5 L 1540.5 653.5 L 1540.5 813.5 L 1503.5 813.5 Z M 327.5 653.5 L 364.5 653.5 L 364.5 813.5 L 327.5 813.5 Z M 433.5 653.5 L 470.5 653.5 L 470.5 813.5 L 433.5 813.5 Z M 539.5 653.5 L 576.5 653.5 L 576.5 813.5 L 539.5 813.5 Z M 645.5 653.5 L 682.5 653.5 L 682.5 813.5 L 645.5 813.5 Z M 751.5 653.5 L 788.5 653.5 L 788.5 813.5 L 751.5 813.5 Z M 857.5 653.5 L 894.5 653.5 L 894.5 813.5 L 857.5 813.5 Z M 963.5 653.5 L 1000.5 653.5 L 1000.5 813.5 L 963.5 813.5 Z M 1079.5 653.5 L 1116.5 653.5 L 1116.5 813.5 L 1079.5 813.5 Z M 1185.5 653.5 L 1222.5 653.5 L 1222.5 813.5 L 1185.5 813.5 Z M 1291.5 653.5 L 1328.5 653.5 L 1328.5 813.5 L 1291.5 813.5 Z M 1397.5 653.5 L 1434.5 653.5 L 1434.5 813.5 L 1397.5 813.5 Z M 1397.5 653.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1503.5 258.5 L 1540.5 258.5 L 1540.5 505.5 L 1503.5 505.5 Z M 327.5 258.5 L 364.5 258.5 L 364.5 505.5 L 327.5 505.5 Z M 433.5 258.5 L 470.5 258.5 L 470.5 505.5 L 433.5 505.5 Z M 539.5 258.5 L 576.5 258.5 L 576.5 505.5 L 539.5 505.5 Z M 645.5 258.5 L 682.5 258.5 L 682.5 505.5 L 645.5 505.5 Z M 751.5 258.5 L 788.5 258.5 L 788.5 505.5 L 751.5 505.5 Z M 857.5 258.5 L 894.5 258.5 L 894.5 505.5 L 857.5 505.5 Z M 963.5 258.5 L 1000.5 258.5 L 1000.5 505.5 L 963.5 505.5 Z M 1069.5 258.5 L 1106.5 258.5 L 1106.5 505.5 L 1069.5 505.5 Z M 1185.5 258.5 L 1222.5 258.5 L 1222.5 505.5 L 1185.5 505.5 Z M 1291.5 258.5 L 1328.5 258.5 L 1328.5 505.5 L 1291.5 505.5 Z M 1397.5 258.5 L 1434.5 258.5 L 1434.5 505.5 L 1397.5 505.5 Z M 1397.5 258.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 257 229 L 299 229 M 257 187 L 299 187 M 257 187 L 257 229 M 299 187 L 299 229 " 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 257 229 L 299 229 M 257 187 L 299 187 M 299 229 L 299 187 M 257 229 L 257 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.svg b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.svg
index 3e53ae4..c1adec9 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_1.svg
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 720.5 666.5 L 761.5 666.5 L 761.5 781.5 L 720.5 781.5 Z M 588.5 666.5 L 629.5 666.5 L 629.5 844.5 L 588.5 844.5 Z M 1161.5 666.5 L 1202.5 666.5 L 1202.5 844.5 L 1161.5 844.5 Z M 1029.5 666.5 L 1070.5 666.5 L 1070.5 844.5 L 1029.5 844.5 Z M 1276.5 666.5 L 1317.5 666.5 L 1317.5 844.5 L 1276.5 844.5 Z M 1276.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 720.5 387.5 L 761.5 387.5 L 761.5 502.5 L 720.5 502.5 Z M 1161.5 228.5 L 1202.5 228.5 L 1202.5 502.5 L 1161.5 502.5 Z M 1029.5 228.5 L 1070.5 228.5 L 1070.5 502.5 L 1029.5 502.5 Z M 1259.5 228.5 L 1300.5 228.5 L 1300.5 502.5 L 1259.5 502.5 Z M 1259.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.svg b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.svg
index 206aa9b..2a2e553 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_2.svg
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 497.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 666.5 L 607.5 666.5 L 607.5 781.5 L 566.5 781.5 Z M 1070.5 666.5 L 1111.5 666.5 L 1111.5 844.5 L 1070.5 844.5 Z M 696.5 666.5 L 737.5 666.5 L 737.5 844.5 L 696.5 844.5 Z M 811.5 666.5 L 852.5 666.5 L 852.5 844.5 L 811.5 844.5 Z M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1200.5 666.5 L 1241.5 666.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1200.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1202.5 228.5 L 1243.5 228.5 L 1243.5 502.5 L 1202.5 502.5 Z M 566.5 387.5 L 607.5 387.5 L 607.5 502.5 L 566.5 502.5 Z M 1300.5 228.5 L 1341.5 228.5 L 1341.5 502.5 L 1300.5 502.5 Z M 1070.5 228.5 L 1111.5 228.5 L 1111.5 502.5 L 1070.5 502.5 Z M 813.5 228.5 L 854.5 228.5 L 854.5 502.5 L 813.5 502.5 Z M 698.5 228.5 L 739.5 228.5 L 739.5 502.5 L 698.5 502.5 Z M 698.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 497 938 L 544 938 M 497 892 L 544 892 M 497 892 L 497 938 M 544 892 L 544 938 " 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 497 938 L 544 938 M 497 892 L 544 892 M 544 938 L 544 892 M 497 938 L 497 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 623 613 L 670 613 M 623 566 L 670 566 M 623 566 L 623 613 M 670 566 L 670 613 M 1378 613 L 1425 613 M 1378 566 L 1425 566 M 1378 566 L 1378 613 M 1425 566 L 1425 613 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.svg b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.svg
index 5ab4f7f..40fc92a 100644
--- a/cells/o21ba/sky130_fd_sc_hd__o21ba_4.svg
+++ b/cells/o21ba/sky130_fd_sc_hd__o21ba_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image323" 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="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1513.5 653.5 L 1550.5 653.5 L 1550.5 813.5 L 1513.5 813.5 Z M 349.5 653.5 L 386.5 653.5 L 386.5 813.5 L 349.5 813.5 Z M 452.5 653.5 L 489.5 653.5 L 489.5 813.5 L 452.5 813.5 Z M 556.5 653.5 L 593.5 653.5 L 593.5 813.5 L 556.5 813.5 Z M 659.5 653.5 L 696.5 653.5 L 696.5 813.5 L 659.5 813.5 Z M 763.5 653.5 L 800.5 653.5 L 800.5 813.5 L 763.5 813.5 Z M 995.5 653.5 L 1032.5 653.5 L 1032.5 813.5 L 995.5 813.5 Z M 1098.5 653.5 L 1135.5 653.5 L 1135.5 813.5 L 1098.5 813.5 Z M 1202.5 653.5 L 1239.5 653.5 L 1239.5 813.5 L 1202.5 813.5 Z M 1306.5 653.5 L 1343.5 653.5 L 1343.5 813.5 L 1306.5 813.5 Z M 1409.5 653.5 L 1446.5 653.5 L 1446.5 813.5 L 1409.5 813.5 Z M 1409.5 653.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1513.5 258.5 L 1550.5 258.5 L 1550.5 505.5 L 1513.5 505.5 Z M 349.5 258.5 L 386.5 258.5 L 386.5 505.5 L 349.5 505.5 Z M 452.5 258.5 L 489.5 258.5 L 489.5 505.5 L 452.5 505.5 Z M 556.5 258.5 L 593.5 258.5 L 593.5 505.5 L 556.5 505.5 Z M 659.5 258.5 L 696.5 258.5 L 696.5 505.5 L 659.5 505.5 Z M 763.5 258.5 L 800.5 258.5 L 800.5 505.5 L 763.5 505.5 Z M 867.5 258.5 L 904.5 258.5 L 904.5 505.5 L 867.5 505.5 Z M 970.5 258.5 L 1007.5 258.5 L 1007.5 505.5 L 970.5 505.5 Z M 1202.5 258.5 L 1239.5 258.5 L 1239.5 505.5 L 1202.5 505.5 Z M 1306.5 258.5 L 1343.5 258.5 L 1343.5 505.5 L 1306.5 505.5 Z M 1409.5 258.5 L 1446.5 258.5 L 1446.5 505.5 L 1409.5 505.5 Z M 1409.5 258.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 371 606 L 413 606 M 371 564 L 413 564 M 371 564 L 371 606 M 413 564 L 413 606 M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.svg b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.svg
index 33bf6c6..91ab447 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_1.svg
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 693.5 666.5 L 734.5 666.5 L 734.5 781.5 L 693.5 781.5 Z M 1076.5 666.5 L 1117.5 666.5 L 1117.5 844.5 L 1076.5 844.5 Z M 950.5 666.5 L 991.5 666.5 L 991.5 844.5 L 950.5 844.5 Z M 1191.5 666.5 L 1232.5 666.5 L 1232.5 844.5 L 1191.5 844.5 Z M 1191.5 666.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 800.5 312.5 L 841.5 312.5 L 841.5 427.5 L 800.5 427.5 Z M 950.5 228.5 L 991.5 228.5 L 991.5 502.5 L 950.5 502.5 Z M 1075.5 228.5 L 1116.5 228.5 L 1116.5 502.5 L 1075.5 502.5 Z M 1185.5 228.5 L 1226.5 228.5 L 1226.5 502.5 L 1185.5 502.5 Z M 1185.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.svg b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.svg
index 741a9a6..9f41540 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_2.svg
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 504.5 666.5 L 545.5 666.5 L 545.5 781.5 L 504.5 781.5 Z M 1124.5 666.5 L 1165.5 666.5 L 1165.5 844.5 L 1124.5 844.5 Z M 779.5 666.5 L 820.5 666.5 L 820.5 844.5 L 779.5 844.5 Z M 894.5 666.5 L 935.5 666.5 L 935.5 844.5 L 894.5 844.5 Z M 1009.5 666.5 L 1050.5 666.5 L 1050.5 844.5 L 1009.5 844.5 Z M 1354.5 666.5 L 1395.5 666.5 L 1395.5 844.5 L 1354.5 844.5 Z M 1239.5 666.5 L 1280.5 666.5 L 1280.5 844.5 L 1239.5 844.5 Z M 1239.5 666.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1239.5 228.5 L 1280.5 228.5 L 1280.5 502.5 L 1239.5 502.5 Z M 504.5 387.5 L 545.5 387.5 L 545.5 502.5 L 504.5 502.5 Z M 1354.5 228.5 L 1395.5 228.5 L 1395.5 502.5 L 1354.5 502.5 Z M 1124.5 228.5 L 1165.5 228.5 L 1165.5 502.5 L 1124.5 502.5 Z M 1009.5 228.5 L 1050.5 228.5 L 1050.5 502.5 L 1009.5 502.5 Z M 752.5 228.5 L 793.5 228.5 L 793.5 502.5 L 752.5 502.5 Z M 637.5 228.5 L 678.5 228.5 L 678.5 502.5 L 637.5 502.5 Z M 637.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.svg b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.svg
index e303a64..2ec40a4 100644
--- a/cells/o21bai/sky130_fd_sc_hd__o21bai_4.svg
+++ b/cells/o21bai/sky130_fd_sc_hd__o21bai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 247.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1510.5 638.5 L 1542.5 638.5 L 1542.5 778.5 L 1510.5 778.5 Z M 311.5 638.5 L 344.5 638.5 L 344.5 778.5 L 311.5 778.5 Z M 514.5 638.5 L 546.5 638.5 L 546.5 778.5 L 514.5 778.5 Z M 604.5 638.5 L 637.5 638.5 L 637.5 778.5 L 604.5 778.5 Z M 695.5 638.5 L 727.5 638.5 L 727.5 778.5 L 695.5 778.5 Z M 785.5 638.5 L 818.5 638.5 L 818.5 778.5 L 785.5 778.5 Z M 876.5 638.5 L 908.5 638.5 L 908.5 778.5 L 876.5 778.5 Z M 967.5 638.5 L 999.5 638.5 L 999.5 778.5 L 967.5 778.5 Z M 1057.5 638.5 L 1089.5 638.5 L 1089.5 778.5 L 1057.5 778.5 Z M 1148.5 638.5 L 1180.5 638.5 L 1180.5 778.5 L 1148.5 778.5 Z M 1238.5 638.5 L 1270.5 638.5 L 1270.5 778.5 L 1238.5 778.5 Z M 1329.5 638.5 L 1361.5 638.5 L 1361.5 778.5 L 1329.5 778.5 Z M 1419.5 638.5 L 1451.5 638.5 L 1451.5 778.5 L 1419.5 778.5 Z M 1419.5 638.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1510.5 293.5 L 1542.5 293.5 L 1542.5 508.5 L 1510.5 508.5 Z M 311.5 293.5 L 344.5 293.5 L 344.5 508.5 L 311.5 508.5 Z M 402.5 293.5 L 434.5 293.5 L 434.5 508.5 L 402.5 508.5 Z M 492.5 293.5 L 525.5 293.5 L 525.5 508.5 L 492.5 508.5 Z M 583.5 293.5 L 615.5 293.5 L 615.5 508.5 L 583.5 508.5 Z M 673.5 293.5 L 706.5 293.5 L 706.5 508.5 L 673.5 508.5 Z M 876.5 293.5 L 908.5 293.5 L 908.5 508.5 L 876.5 508.5 Z M 967.5 293.5 L 999.5 293.5 L 999.5 508.5 L 967.5 508.5 Z M 1057.5 293.5 L 1089.5 293.5 L 1089.5 508.5 L 1057.5 508.5 Z M 1148.5 293.5 L 1180.5 293.5 L 1180.5 508.5 L 1148.5 508.5 Z M 1238.5 293.5 L 1270.5 293.5 L 1270.5 508.5 L 1238.5 508.5 Z M 1329.5 293.5 L 1361.5 293.5 L 1361.5 508.5 L 1329.5 508.5 Z M 1419.5 293.5 L 1451.5 293.5 L 1451.5 508.5 L 1419.5 508.5 Z M 1419.5 293.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <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 247 855 L 283 855 M 247 819 L 283 819 M 247 819 L 247 855 M 283 819 L 283 855 " 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 247 855 L 283 855 M 247 819 L 283 819 M 283 855 L 283 819 M 247 855 L 247 819 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1536 525 L 1572 525 M 1536 489 L 1572 489 M 1536 489 L 1536 525 M 1572 489 L 1572 525 M 1635 525 L 1671 525 M 1635 489 L 1671 489 M 1635 489 L 1635 525 M 1671 489 L 1671 525 M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_1.svg b/cells/o221a/sky130_fd_sc_hd__o221a_1.svg
index ae3de8e..456e81e 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_1.svg
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" 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="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1284.5 666.5 L 1325.5 666.5 L 1325.5 844.5 L 1284.5 844.5 Z M 558.5 666.5 L 599.5 666.5 L 599.5 844.5 L 558.5 844.5 Z M 682.5 666.5 L 723.5 666.5 L 723.5 844.5 L 682.5 844.5 Z M 797.5 666.5 L 838.5 666.5 L 838.5 844.5 L 797.5 844.5 Z M 1054.5 666.5 L 1095.5 666.5 L 1095.5 844.5 L 1054.5 844.5 Z M 1169.5 666.5 L 1210.5 666.5 L 1210.5 844.5 L 1169.5 844.5 Z M 1169.5 666.5 "/>
 </clipPath>
-<image id="image310" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1284.5 228.5 L 1325.5 228.5 L 1325.5 502.5 L 1284.5 502.5 Z M 558.5 228.5 L 599.5 228.5 L 599.5 502.5 L 558.5 502.5 Z M 689.5 228.5 L 730.5 228.5 L 730.5 502.5 L 689.5 502.5 Z M 787.5 228.5 L 828.5 228.5 L 828.5 502.5 L 787.5 502.5 Z M 1054.5 228.5 L 1095.5 228.5 L 1095.5 502.5 L 1054.5 502.5 Z M 1153.5 228.5 L 1194.5 228.5 L 1194.5 502.5 L 1153.5 502.5 Z M 1153.5 228.5 "/>
 </clipPath>
-<image id="image311" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image312" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_2.svg b/cells/o221a/sky130_fd_sc_hd__o221a_2.svg
index ca54ec5..5c0bab8 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_2.svg
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" 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="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 428.5 885.5 L 474.5 885.5 L 474.5 931.5 L 428.5 931.5 Z M 428.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 547.5 666.5 L 588.5 666.5 L 588.5 844.5 L 547.5 844.5 Z M 661.5 666.5 L 703.5 666.5 L 703.5 844.5 L 661.5 844.5 Z M 776.5 666.5 L 817.5 666.5 L 817.5 844.5 L 776.5 844.5 Z M 1034.5 666.5 L 1075.5 666.5 L 1075.5 844.5 L 1034.5 844.5 Z M 1148.5 666.5 L 1189.5 666.5 L 1189.5 844.5 L 1148.5 844.5 Z M 1263.5 666.5 L 1304.5 666.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1263.5 666.5 "/>
 </clipPath>
-<image id="image310" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 547.5 228.5 L 588.5 228.5 L 588.5 502.5 L 547.5 502.5 Z M 678.5 228.5 L 719.5 228.5 L 719.5 502.5 L 678.5 502.5 Z M 780.5 228.5 L 822.5 228.5 L 822.5 502.5 L 780.5 502.5 Z M 1034.5 228.5 L 1075.5 228.5 L 1075.5 502.5 L 1034.5 502.5 Z M 1132.5 228.5 L 1173.5 228.5 L 1173.5 502.5 L 1132.5 502.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 502.5 L 1263.5 502.5 Z M 1263.5 228.5 "/>
 </clipPath>
-<image id="image311" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image312" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 938 L 480 938 M 433 892 L 480 892 M 433 892 L 433 938 M 480 892 L 480 938 " 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 938 L 480 938 M 433 892 L 480 892 M 480 938 L 480 892 M 433 938 L 433 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hd__o221a_4.svg b/cells/o221a/sky130_fd_sc_hd__o221a_4.svg
index 1dfa977..8feba83 100644
--- a/cells/o221a/sky130_fd_sc_hd__o221a_4.svg
+++ b/cells/o221a/sky130_fd_sc_hd__o221a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1505.5 631.5 L 1535.5 631.5 L 1535.5 763.5 L 1505.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 909.5 631.5 L 939.5 631.5 L 939.5 763.5 L 909.5 763.5 Z M 994.5 631.5 L 1024.5 631.5 L 1024.5 763.5 L 994.5 763.5 Z M 1079.5 631.5 L 1109.5 631.5 L 1109.5 763.5 L 1079.5 763.5 Z M 1164.5 631.5 L 1195.5 631.5 L 1195.5 763.5 L 1164.5 763.5 Z M 1249.5 631.5 L 1280.5 631.5 L 1280.5 763.5 L 1249.5 763.5 Z M 1335.5 631.5 L 1365.5 631.5 L 1365.5 763.5 L 1335.5 763.5 Z M 1420.5 631.5 L 1450.5 631.5 L 1450.5 763.5 L 1420.5 763.5 Z M 1420.5 631.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1505.5 307.5 L 1535.5 307.5 L 1535.5 510.5 L 1505.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 909.5 307.5 L 939.5 307.5 L 939.5 510.5 L 909.5 510.5 Z M 994.5 307.5 L 1024.5 307.5 L 1024.5 510.5 L 994.5 510.5 Z M 1079.5 307.5 L 1109.5 307.5 L 1109.5 510.5 L 1079.5 510.5 Z M 1164.5 307.5 L 1195.5 307.5 L 1195.5 510.5 L 1164.5 510.5 Z M 1249.5 307.5 L 1280.5 307.5 L 1280.5 510.5 L 1249.5 510.5 Z M 1335.5 307.5 L 1365.5 307.5 L 1365.5 510.5 L 1335.5 510.5 Z M 1420.5 307.5 L 1450.5 307.5 L 1450.5 510.5 L 1420.5 510.5 Z M 1420.5 307.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 243 837 L 277 837 M 243 802 L 277 802 M 243 802 L 243 837 M 277 802 L 277 837 " 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 243 837 L 277 837 M 243 802 L 277 802 M 277 837 L 277 802 M 243 837 L 243 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 429 596 L 464 596 M 429 561 L 464 561 M 429 561 L 429 596 M 464 561 L 464 596 M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.svg b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.svg
index ef9f42c..10bde28 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_1.svg
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" 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="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 884.5 666.5 L 925.5 666.5 L 925.5 844.5 L 884.5 844.5 Z M 999.5 666.5 L 1040.5 666.5 L 1040.5 844.5 L 999.5 844.5 Z M 1139.5 666.5 L 1180.5 666.5 L 1180.5 844.5 L 1139.5 844.5 Z M 1139.5 666.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 502.5 L 884.5 502.5 Z M 991.5 228.5 L 1032.5 228.5 L 1032.5 502.5 L 991.5 502.5 Z M 1155.5 228.5 L 1196.5 228.5 L 1196.5 502.5 L 1155.5 502.5 Z M 1155.5 228.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.svg b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.svg
index 1e05259..ee371a4 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_2.svg
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" 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="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1497.5 662.5 L 1537.5 662.5 L 1537.5 835.5 L 1497.5 835.5 Z M 332.5 662.5 L 372.5 662.5 L 372.5 835.5 L 332.5 835.5 Z M 444.5 662.5 L 484.5 662.5 L 484.5 835.5 L 444.5 835.5 Z M 694.5 662.5 L 734.5 662.5 L 734.5 835.5 L 694.5 835.5 Z M 806.5 662.5 L 845.5 662.5 L 845.5 835.5 L 806.5 835.5 Z M 917.5 662.5 L 957.5 662.5 L 957.5 835.5 L 917.5 835.5 Z M 1029.5 662.5 L 1069.5 662.5 L 1069.5 835.5 L 1029.5 835.5 Z M 1162.5 662.5 L 1202.5 662.5 L 1202.5 835.5 L 1162.5 835.5 Z M 1274.5 662.5 L 1314.5 662.5 L 1314.5 835.5 L 1274.5 835.5 Z M 1385.5 662.5 L 1425.5 662.5 L 1425.5 835.5 L 1385.5 835.5 Z M 1385.5 662.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1497.5 237.5 L 1537.5 237.5 L 1537.5 503.5 L 1497.5 503.5 Z M 332.5 237.5 L 372.5 237.5 L 372.5 503.5 L 332.5 503.5 Z M 444.5 237.5 L 484.5 237.5 L 484.5 503.5 L 444.5 503.5 Z M 694.5 237.5 L 734.5 237.5 L 734.5 503.5 L 694.5 503.5 Z M 806.5 237.5 L 845.5 237.5 L 845.5 503.5 L 806.5 503.5 Z M 917.5 237.5 L 957.5 237.5 L 957.5 503.5 L 917.5 503.5 Z M 1029.5 237.5 L 1069.5 237.5 L 1069.5 503.5 L 1029.5 503.5 Z M 1162.5 237.5 L 1202.5 237.5 L 1202.5 503.5 L 1162.5 503.5 Z M 1274.5 237.5 L 1314.5 237.5 L 1314.5 503.5 L 1274.5 503.5 Z M 1385.5 237.5 L 1425.5 237.5 L 1425.5 503.5 L 1385.5 503.5 Z M 1385.5 237.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.svg b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.svg
index 42188fa..f63ec93 100644
--- a/cells/o221ai/sky130_fd_sc_hd__o221ai_4.svg
+++ b/cells/o221ai/sky130_fd_sc_hd__o221ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" 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="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 734.5 L 253.5 734.5 L 253.5 760.5 L 227.5 760.5 Z M 227.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1610.5 609.5 L 1633.5 609.5 L 1633.5 710.5 L 1610.5 710.5 Z M 268.5 609.5 L 292.5 609.5 L 292.5 710.5 L 268.5 710.5 Z M 334.5 609.5 L 357.5 609.5 L 357.5 710.5 L 334.5 710.5 Z M 400.5 609.5 L 423.5 609.5 L 423.5 710.5 L 400.5 710.5 Z M 465.5 609.5 L 489.5 609.5 L 489.5 710.5 L 465.5 710.5 Z M 612.5 609.5 L 636.5 609.5 L 636.5 710.5 L 612.5 710.5 Z M 678.5 609.5 L 701.5 609.5 L 701.5 710.5 L 678.5 710.5 Z M 744.5 609.5 L 767.5 609.5 L 767.5 710.5 L 744.5 710.5 Z M 809.5 609.5 L 833.5 609.5 L 833.5 710.5 L 809.5 710.5 Z M 875.5 609.5 L 898.5 609.5 L 898.5 710.5 L 875.5 710.5 Z M 941.5 609.5 L 964.5 609.5 L 964.5 710.5 L 941.5 710.5 Z M 1006.5 609.5 L 1030.5 609.5 L 1030.5 710.5 L 1006.5 710.5 Z M 1072.5 609.5 L 1095.5 609.5 L 1095.5 710.5 L 1072.5 710.5 Z M 1150.5 609.5 L 1174.5 609.5 L 1174.5 710.5 L 1150.5 710.5 Z M 1216.5 609.5 L 1239.5 609.5 L 1239.5 710.5 L 1216.5 710.5 Z M 1282.5 609.5 L 1305.5 609.5 L 1305.5 710.5 L 1282.5 710.5 Z M 1347.5 609.5 L 1371.5 609.5 L 1371.5 710.5 L 1347.5 710.5 Z M 1413.5 609.5 L 1436.5 609.5 L 1436.5 710.5 L 1413.5 710.5 Z M 1479.5 609.5 L 1502.5 609.5 L 1502.5 710.5 L 1479.5 710.5 Z M 1544.5 609.5 L 1568.5 609.5 L 1568.5 710.5 L 1544.5 710.5 Z M 1544.5 609.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 358.5 L 1633.5 358.5 L 1633.5 515.5 L 1610.5 515.5 Z M 268.5 358.5 L 292.5 358.5 L 292.5 515.5 L 268.5 515.5 Z M 334.5 358.5 L 357.5 358.5 L 357.5 515.5 L 334.5 515.5 Z M 400.5 358.5 L 423.5 358.5 L 423.5 515.5 L 400.5 515.5 Z M 465.5 358.5 L 489.5 358.5 L 489.5 515.5 L 465.5 515.5 Z M 612.5 358.5 L 636.5 358.5 L 636.5 515.5 L 612.5 515.5 Z M 678.5 358.5 L 701.5 358.5 L 701.5 515.5 L 678.5 515.5 Z M 744.5 358.5 L 767.5 358.5 L 767.5 515.5 L 744.5 515.5 Z M 809.5 358.5 L 833.5 358.5 L 833.5 515.5 L 809.5 515.5 Z M 875.5 358.5 L 898.5 358.5 L 898.5 515.5 L 875.5 515.5 Z M 941.5 358.5 L 964.5 358.5 L 964.5 515.5 L 941.5 515.5 Z M 1006.5 358.5 L 1030.5 358.5 L 1030.5 515.5 L 1006.5 515.5 Z M 1072.5 358.5 L 1095.5 358.5 L 1095.5 515.5 L 1072.5 515.5 Z M 1150.5 358.5 L 1174.5 358.5 L 1174.5 515.5 L 1150.5 515.5 Z M 1216.5 358.5 L 1239.5 358.5 L 1239.5 515.5 L 1216.5 515.5 Z M 1282.5 358.5 L 1305.5 358.5 L 1305.5 515.5 L 1282.5 515.5 Z M 1347.5 358.5 L 1371.5 358.5 L 1371.5 515.5 L 1347.5 515.5 Z M 1413.5 358.5 L 1436.5 358.5 L 1436.5 515.5 L 1413.5 515.5 Z M 1479.5 358.5 L 1502.5 358.5 L 1502.5 515.5 L 1479.5 515.5 Z M 1544.5 358.5 L 1568.5 358.5 L 1568.5 515.5 L 1544.5 515.5 Z M 1544.5 358.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 227 771 L 253 771 M 227 744 L 253 744 M 227 744 L 227 771 M 253 744 L 253 771 " 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 227 771 L 253 771 M 227 744 L 253 744 M 253 771 L 253 744 M 227 771 L 227 744 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_1.svg b/cells/o22a/sky130_fd_sc_hd__o22a_1.svg
index 8b350ef..c5b3d05 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_1.svg
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 666.5 L 1295.5 666.5 L 1295.5 844.5 L 1254.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 887.5 666.5 L 928.5 666.5 L 928.5 844.5 L 887.5 844.5 Z M 1002.5 666.5 L 1043.5 666.5 L 1043.5 844.5 L 1002.5 844.5 Z M 1139.5 666.5 L 1180.5 666.5 L 1180.5 844.5 L 1139.5 844.5 Z M 1139.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1254.5 228.5 L 1295.5 228.5 L 1295.5 502.5 L 1254.5 502.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 880.5 228.5 L 921.5 228.5 L 921.5 502.5 L 880.5 502.5 Z M 986.5 228.5 L 1027.5 228.5 L 1027.5 502.5 L 986.5 502.5 Z M 1155.5 228.5 L 1196.5 228.5 L 1196.5 502.5 L 1155.5 502.5 Z M 1155.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_2.svg b/cells/o22a/sky130_fd_sc_hd__o22a_2.svg
index 6de3783..3ee3bf7 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_2.svg
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 493.5 885.5 L 540.5 885.5 L 540.5 931.5 L 493.5 931.5 Z M 493.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 568.5 666.5 L 610.5 666.5 L 610.5 844.5 L 568.5 844.5 Z M 683.5 666.5 L 724.5 666.5 L 724.5 844.5 L 683.5 844.5 Z M 941.5 666.5 L 982.5 666.5 L 982.5 844.5 L 941.5 844.5 Z M 1055.5 666.5 L 1096.5 666.5 L 1096.5 844.5 L 1055.5 844.5 Z M 1200.5 666.5 L 1241.5 666.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1200.5 666.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1307.5 228.5 L 1348.5 228.5 L 1348.5 502.5 L 1307.5 502.5 Z M 571.5 228.5 L 612.5 228.5 L 612.5 502.5 L 571.5 502.5 Z M 686.5 228.5 L 727.5 228.5 L 727.5 502.5 L 686.5 502.5 Z M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 1039.5 228.5 L 1080.5 228.5 L 1080.5 502.5 L 1039.5 502.5 Z M 1209.5 228.5 L 1250.5 228.5 L 1250.5 502.5 L 1209.5 502.5 Z M 1209.5 228.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 493 938 L 540 938 M 493 892 L 540 892 M 493 892 L 493 938 M 540 892 L 540 938 " 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 493 938 L 540 938 M 493 892 L 540 892 M 540 938 L 540 892 M 493 938 L 493 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1377 613 L 1423 613 M 1377 566 L 1423 566 M 1377 566 L 1377 613 M 1423 566 L 1423 613 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hd__o22a_4.svg b/cells/o22a/sky130_fd_sc_hd__o22a_4.svg
index 2051ace..2ef2249 100644
--- a/cells/o22a/sky130_fd_sc_hd__o22a_4.svg
+++ b/cells/o22a/sky130_fd_sc_hd__o22a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 251.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1529.5 645.5 L 1563.5 645.5 L 1563.5 794.5 L 1529.5 794.5 Z M 328.5 645.5 L 363.5 645.5 L 363.5 794.5 L 328.5 794.5 Z M 425.5 645.5 L 459.5 645.5 L 459.5 794.5 L 425.5 794.5 Z M 521.5 645.5 L 556.5 645.5 L 556.5 794.5 L 521.5 794.5 Z M 618.5 645.5 L 652.5 645.5 L 652.5 794.5 L 618.5 794.5 Z M 834.5 645.5 L 869.5 645.5 L 869.5 794.5 L 834.5 794.5 Z M 931.5 645.5 L 965.5 645.5 L 965.5 794.5 L 931.5 794.5 Z M 1027.5 645.5 L 1062.5 645.5 L 1062.5 794.5 L 1027.5 794.5 Z M 1124.5 645.5 L 1159.5 645.5 L 1159.5 794.5 L 1124.5 794.5 Z M 1239.5 645.5 L 1274.5 645.5 L 1274.5 794.5 L 1239.5 794.5 Z M 1336.5 645.5 L 1370.5 645.5 L 1370.5 794.5 L 1336.5 794.5 Z M 1432.5 645.5 L 1467.5 645.5 L 1467.5 794.5 L 1432.5 794.5 Z M 1432.5 645.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1529.5 277.5 L 1563.5 277.5 L 1563.5 507.5 L 1529.5 507.5 Z M 328.5 277.5 L 363.5 277.5 L 363.5 507.5 L 328.5 507.5 Z M 425.5 277.5 L 459.5 277.5 L 459.5 507.5 L 425.5 507.5 Z M 521.5 277.5 L 556.5 277.5 L 556.5 507.5 L 521.5 507.5 Z M 618.5 277.5 L 652.5 277.5 L 652.5 507.5 L 618.5 507.5 Z M 834.5 277.5 L 869.5 277.5 L 869.5 507.5 L 834.5 507.5 Z M 931.5 277.5 L 965.5 277.5 L 965.5 507.5 L 931.5 507.5 Z M 1027.5 277.5 L 1062.5 277.5 L 1062.5 507.5 L 1027.5 507.5 Z M 1124.5 277.5 L 1159.5 277.5 L 1159.5 507.5 L 1124.5 507.5 Z M 1239.5 277.5 L 1274.5 277.5 L 1274.5 507.5 L 1239.5 507.5 Z M 1336.5 277.5 L 1370.5 277.5 L 1370.5 507.5 L 1336.5 507.5 Z M 1432.5 277.5 L 1467.5 277.5 L 1467.5 507.5 L 1432.5 507.5 Z M 1432.5 277.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 251 876 L 290 876 M 251 837 L 290 837 M 251 837 L 251 876 M 290 837 L 290 876 " 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 251 876 L 290 876 M 251 837 L 290 837 M 290 876 L 290 837 M 251 876 L 251 837 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.svg b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.svg
index 894fc5a..5ff5a65 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_1.svg
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 875.5 666.5 L 916.5 666.5 L 916.5 844.5 L 875.5 844.5 Z M 1013.5 666.5 L 1054.5 666.5 L 1054.5 844.5 L 1013.5 844.5 Z M 1013.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1125.5 228.5 L 1166.5 228.5 L 1166.5 502.5 L 1125.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 858.5 228.5 L 899.5 228.5 L 899.5 502.5 L 858.5 502.5 Z M 1027.5 228.5 L 1068.5 228.5 L 1068.5 502.5 L 1027.5 502.5 Z M 1027.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image295" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.svg b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.svg
index 842cb4c..3f820d4 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_2.svg
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1401.5 666.5 L 1442.5 666.5 L 1442.5 844.5 L 1401.5 844.5 Z M 444.5 666.5 L 485.5 666.5 L 485.5 844.5 L 444.5 844.5 Z M 559.5 666.5 L 600.5 666.5 L 600.5 844.5 L 559.5 844.5 Z M 674.5 666.5 L 715.5 666.5 L 715.5 844.5 L 674.5 844.5 Z M 789.5 666.5 L 830.5 666.5 L 830.5 844.5 L 789.5 844.5 Z M 1057.5 666.5 L 1098.5 666.5 L 1098.5 844.5 L 1057.5 844.5 Z M 1172.5 666.5 L 1213.5 666.5 L 1213.5 844.5 L 1172.5 844.5 Z M 1287.5 666.5 L 1328.5 666.5 L 1328.5 844.5 L 1287.5 844.5 Z M 1287.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1401.5 228.5 L 1442.5 228.5 L 1442.5 502.5 L 1401.5 502.5 Z M 444.5 228.5 L 485.5 228.5 L 485.5 502.5 L 444.5 502.5 Z M 559.5 228.5 L 600.5 228.5 L 600.5 502.5 L 559.5 502.5 Z M 674.5 228.5 L 715.5 228.5 L 715.5 502.5 L 674.5 502.5 Z M 789.5 228.5 L 830.5 228.5 L 830.5 502.5 L 789.5 502.5 Z M 1057.5 228.5 L 1098.5 228.5 L 1098.5 502.5 L 1057.5 502.5 Z M 1172.5 228.5 L 1213.5 228.5 L 1213.5 502.5 L 1172.5 502.5 Z M 1287.5 228.5 L 1328.5 228.5 L 1328.5 502.5 L 1287.5 502.5 Z M 1287.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image295" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.svg b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.svg
index 30de316..1f4f5f7 100644
--- a/cells/o22ai/sky130_fd_sc_hd__o22ai_4.svg
+++ b/cells/o22ai/sky130_fd_sc_hd__o22ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1586.5 631.5 L 1616.5 631.5 L 1616.5 763.5 L 1586.5 763.5 Z M 298.5 631.5 L 329.5 631.5 L 329.5 763.5 L 298.5 763.5 Z M 384.5 631.5 L 414.5 631.5 L 414.5 763.5 L 384.5 763.5 Z M 469.5 631.5 L 499.5 631.5 L 499.5 763.5 L 469.5 763.5 Z M 554.5 631.5 L 584.5 631.5 L 584.5 763.5 L 554.5 763.5 Z M 639.5 631.5 L 669.5 631.5 L 669.5 763.5 L 639.5 763.5 Z M 724.5 631.5 L 755.5 631.5 L 755.5 763.5 L 724.5 763.5 Z M 809.5 631.5 L 840.5 631.5 L 840.5 763.5 L 809.5 763.5 Z M 895.5 631.5 L 925.5 631.5 L 925.5 763.5 L 895.5 763.5 Z M 990.5 631.5 L 1020.5 631.5 L 1020.5 763.5 L 990.5 763.5 Z M 1075.5 631.5 L 1105.5 631.5 L 1105.5 763.5 L 1075.5 763.5 Z M 1160.5 631.5 L 1191.5 631.5 L 1191.5 763.5 L 1160.5 763.5 Z M 1245.5 631.5 L 1276.5 631.5 L 1276.5 763.5 L 1245.5 763.5 Z M 1330.5 631.5 L 1361.5 631.5 L 1361.5 763.5 L 1330.5 763.5 Z M 1416.5 631.5 L 1446.5 631.5 L 1446.5 763.5 L 1416.5 763.5 Z M 1501.5 631.5 L 1531.5 631.5 L 1531.5 763.5 L 1501.5 763.5 Z M 1501.5 631.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1586.5 307.5 L 1616.5 307.5 L 1616.5 510.5 L 1586.5 510.5 Z M 298.5 307.5 L 329.5 307.5 L 329.5 510.5 L 298.5 510.5 Z M 384.5 307.5 L 414.5 307.5 L 414.5 510.5 L 384.5 510.5 Z M 469.5 307.5 L 499.5 307.5 L 499.5 510.5 L 469.5 510.5 Z M 554.5 307.5 L 584.5 307.5 L 584.5 510.5 L 554.5 510.5 Z M 639.5 307.5 L 669.5 307.5 L 669.5 510.5 L 639.5 510.5 Z M 724.5 307.5 L 755.5 307.5 L 755.5 510.5 L 724.5 510.5 Z M 809.5 307.5 L 840.5 307.5 L 840.5 510.5 L 809.5 510.5 Z M 895.5 307.5 L 925.5 307.5 L 925.5 510.5 L 895.5 510.5 Z M 990.5 307.5 L 1020.5 307.5 L 1020.5 510.5 L 990.5 510.5 Z M 1075.5 307.5 L 1105.5 307.5 L 1105.5 510.5 L 1075.5 510.5 Z M 1160.5 307.5 L 1191.5 307.5 L 1191.5 510.5 L 1160.5 510.5 Z M 1245.5 307.5 L 1276.5 307.5 L 1276.5 510.5 L 1245.5 510.5 Z M 1330.5 307.5 L 1361.5 307.5 L 1361.5 510.5 L 1330.5 510.5 Z M 1416.5 307.5 L 1446.5 307.5 L 1446.5 510.5 L 1416.5 510.5 Z M 1501.5 307.5 L 1531.5 307.5 L 1531.5 510.5 L 1501.5 510.5 Z M 1501.5 307.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 242 837 L 276 837 M 242 802 L 276 802 M 242 802 L 242 837 M 276 802 L 276 837 " 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 242 837 L 276 837 M 242 802 L 276 802 M 276 837 L 276 802 M 242 837 L 242 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.svg b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.svg
index 305bbc6..e73a503 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 666.5 L 607.5 666.5 L 607.5 844.5 L 566.5 844.5 Z M 1315.5 729.5 L 1356.5 729.5 L 1356.5 844.5 L 1315.5 844.5 Z M 1200.5 729.5 L 1241.5 729.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1085.5 729.5 L 1127.5 729.5 L 1127.5 844.5 L 1085.5 844.5 Z M 824.5 729.5 L 865.5 729.5 L 865.5 844.5 L 824.5 844.5 Z M 697.5 729.5 L 738.5 729.5 L 738.5 844.5 L 697.5 844.5 Z M 697.5 729.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 698.5 289.5 L 739.5 289.5 L 739.5 403.5 L 698.5 403.5 Z M 1315.5 289.5 L 1356.5 289.5 L 1356.5 403.5 L 1315.5 403.5 Z M 1217.5 289.5 L 1258.5 289.5 L 1258.5 403.5 L 1217.5 403.5 Z M 1088.5 289.5 L 1129.5 289.5 L 1129.5 403.5 L 1088.5 403.5 Z M 849.5 289.5 L 890.5 289.5 L 890.5 403.5 L 849.5 403.5 Z M 566.5 228.5 L 607.5 228.5 L 607.5 502.5 L 566.5 502.5 Z M 566.5 228.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1378 613 L 1425 613 M 1378 566 L 1425 566 M 1378 566 L 1378 613 M 1425 566 L 1425 613 M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.svg b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.svg
index 87a1e1c..bb975ca 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image333" 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="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 432.5 885.5 L 478.5 885.5 L 478.5 931.5 L 432.5 931.5 Z M 432.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 510.5 666.5 L 551.5 666.5 L 551.5 844.5 L 510.5 844.5 Z M 1378.5 729.5 L 1419.5 729.5 L 1419.5 844.5 L 1378.5 844.5 Z M 1263.5 729.5 L 1304.5 729.5 L 1304.5 844.5 L 1263.5 844.5 Z M 1148.5 729.5 L 1189.5 729.5 L 1189.5 844.5 L 1148.5 844.5 Z M 883.5 729.5 L 924.5 729.5 L 924.5 844.5 L 883.5 844.5 Z M 756.5 729.5 L 797.5 729.5 L 797.5 844.5 L 756.5 844.5 Z M 625.5 666.5 L 666.5 666.5 L 666.5 844.5 L 625.5 844.5 Z M 625.5 666.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 403.5 L 1378.5 403.5 Z M 1263.5 228.5 L 1304.5 228.5 L 1304.5 403.5 L 1263.5 403.5 Z M 908.5 228.5 L 949.5 228.5 L 949.5 403.5 L 908.5 403.5 Z M 757.5 228.5 L 798.5 228.5 L 798.5 403.5 L 757.5 403.5 Z M 1143.5 228.5 L 1184.5 228.5 L 1184.5 403.5 L 1143.5 403.5 Z M 510.5 228.5 L 551.5 228.5 L 551.5 502.5 L 510.5 502.5 Z M 625.5 228.5 L 666.5 228.5 L 666.5 502.5 L 625.5 502.5 Z M 625.5 228.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 432 938 L 478 938 M 432 892 L 478 892 M 432 892 L 432 938 M 478 892 L 478 938 " 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 432 938 L 478 938 M 432 892 L 478 892 M 478 938 L 478 892 M 432 938 L 432 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1438 613 L 1485 613 M 1438 566 L 1485 566 M 1438 566 L 1438 613 M 1485 566 L 1485 613 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.svg b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.svg
index 3f8e09c..984a774 100644
--- a/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hd__o2bb2a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" 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="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 242.5 794.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1505.5 631.5 L 1535.5 631.5 L 1535.5 763.5 L 1505.5 763.5 Z M 292.5 631.5 L 323.5 631.5 L 323.5 763.5 L 292.5 763.5 Z M 377.5 631.5 L 408.5 631.5 L 408.5 763.5 L 377.5 763.5 Z M 463.5 631.5 L 493.5 631.5 L 493.5 763.5 L 463.5 763.5 Z M 548.5 631.5 L 578.5 631.5 L 578.5 763.5 L 548.5 763.5 Z M 633.5 631.5 L 663.5 631.5 L 663.5 763.5 L 633.5 763.5 Z M 718.5 631.5 L 749.5 631.5 L 749.5 763.5 L 718.5 763.5 Z M 909.5 631.5 L 939.5 631.5 L 939.5 763.5 L 909.5 763.5 Z M 994.5 631.5 L 1024.5 631.5 L 1024.5 763.5 L 994.5 763.5 Z M 1079.5 631.5 L 1109.5 631.5 L 1109.5 763.5 L 1079.5 763.5 Z M 1164.5 631.5 L 1195.5 631.5 L 1195.5 763.5 L 1164.5 763.5 Z M 1249.5 631.5 L 1280.5 631.5 L 1280.5 763.5 L 1249.5 763.5 Z M 1335.5 631.5 L 1365.5 631.5 L 1365.5 763.5 L 1335.5 763.5 Z M 1420.5 631.5 L 1450.5 631.5 L 1450.5 763.5 L 1420.5 763.5 Z M 1420.5 631.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1505.5 307.5 L 1535.5 307.5 L 1535.5 510.5 L 1505.5 510.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 510.5 L 292.5 510.5 Z M 377.5 307.5 L 408.5 307.5 L 408.5 510.5 L 377.5 510.5 Z M 463.5 307.5 L 493.5 307.5 L 493.5 510.5 L 463.5 510.5 Z M 548.5 307.5 L 578.5 307.5 L 578.5 510.5 L 548.5 510.5 Z M 633.5 307.5 L 663.5 307.5 L 663.5 510.5 L 633.5 510.5 Z M 718.5 307.5 L 749.5 307.5 L 749.5 510.5 L 718.5 510.5 Z M 909.5 307.5 L 939.5 307.5 L 939.5 510.5 L 909.5 510.5 Z M 994.5 307.5 L 1024.5 307.5 L 1024.5 510.5 L 994.5 510.5 Z M 1079.5 307.5 L 1109.5 307.5 L 1109.5 510.5 L 1079.5 510.5 Z M 1164.5 307.5 L 1195.5 307.5 L 1195.5 510.5 L 1164.5 510.5 Z M 1249.5 307.5 L 1280.5 307.5 L 1280.5 510.5 L 1249.5 510.5 Z M 1335.5 307.5 L 1365.5 307.5 L 1365.5 510.5 L 1335.5 510.5 Z M 1420.5 307.5 L 1450.5 307.5 L 1450.5 510.5 L 1420.5 510.5 Z M 1420.5 307.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 708.5 483.5 L 742.5 483.5 L 742.5 518.5 L 708.5 518.5 Z M 1272.5 483.5 L 1306.5 483.5 L 1306.5 518.5 L 1272.5 518.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 242 837 L 276 837 M 242 802 L 276 802 M 242 802 L 242 837 M 276 802 L 276 837 " 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 242 837 L 276 837 M 242 802 L 276 802 M 276 837 L 276 802 M 242 837 L 242 802 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1552 527 L 1586 527 M 1552 492 L 1586 492 M 1552 492 L 1552 527 M 1586 492 L 1586 527 M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.svg b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.svg
index 049dd44..ce3296d 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1250.5 666.5 L 1291.5 666.5 L 1291.5 844.5 L 1250.5 844.5 Z M 634.5 666.5 L 675.5 666.5 L 675.5 844.5 L 634.5 844.5 Z M 733.5 666.5 L 774.5 666.5 L 774.5 844.5 L 733.5 844.5 Z M 1020.5 666.5 L 1061.5 666.5 L 1061.5 844.5 L 1020.5 844.5 Z M 1135.5 666.5 L 1176.5 666.5 L 1176.5 844.5 L 1135.5 844.5 Z M 1135.5 666.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1250.5 228.5 L 1291.5 228.5 L 1291.5 502.5 L 1250.5 502.5 Z M 634.5 228.5 L 675.5 228.5 L 675.5 502.5 L 634.5 502.5 Z M 749.5 228.5 L 790.5 228.5 L 790.5 502.5 L 749.5 502.5 Z M 1020.5 228.5 L 1061.5 228.5 L 1061.5 502.5 L 1020.5 502.5 Z M 1135.5 228.5 L 1176.5 228.5 L 1176.5 502.5 L 1135.5 502.5 Z M 1135.5 228.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.svg b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.svg
index ee417c4..98cd6d7 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1492.5 662.5 L 1532.5 662.5 L 1532.5 835.5 L 1492.5 835.5 Z M 336.5 662.5 L 376.5 662.5 L 376.5 835.5 L 336.5 835.5 Z M 448.5 662.5 L 488.5 662.5 L 488.5 835.5 L 448.5 835.5 Z M 560.5 662.5 L 599.5 662.5 L 599.5 835.5 L 560.5 835.5 Z M 671.5 662.5 L 711.5 662.5 L 711.5 835.5 L 671.5 835.5 Z M 924.5 662.5 L 964.5 662.5 L 964.5 835.5 L 924.5 835.5 Z M 1036.5 662.5 L 1076.5 662.5 L 1076.5 835.5 L 1036.5 835.5 Z M 1157.5 662.5 L 1197.5 662.5 L 1197.5 835.5 L 1157.5 835.5 Z M 1268.5 662.5 L 1308.5 662.5 L 1308.5 835.5 L 1268.5 835.5 Z M 1380.5 662.5 L 1420.5 662.5 L 1420.5 835.5 L 1380.5 835.5 Z M 1380.5 662.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1492.5 237.5 L 1532.5 237.5 L 1532.5 503.5 L 1492.5 503.5 Z M 336.5 237.5 L 376.5 237.5 L 376.5 503.5 L 336.5 503.5 Z M 448.5 237.5 L 488.5 237.5 L 488.5 503.5 L 448.5 503.5 Z M 560.5 237.5 L 599.5 237.5 L 599.5 503.5 L 560.5 503.5 Z M 671.5 237.5 L 711.5 237.5 L 711.5 503.5 L 671.5 503.5 Z M 924.5 237.5 L 964.5 237.5 L 964.5 503.5 L 924.5 503.5 Z M 1036.5 237.5 L 1076.5 237.5 L 1076.5 503.5 L 1036.5 503.5 Z M 1157.5 237.5 L 1197.5 237.5 L 1197.5 503.5 L 1157.5 503.5 Z M 1268.5 237.5 L 1308.5 237.5 L 1308.5 503.5 L 1268.5 503.5 Z M 1380.5 237.5 L 1420.5 237.5 L 1420.5 503.5 L 1380.5 503.5 Z M 1380.5 237.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.svg b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.svg
index 60fce44..faf4bb2 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hd__o2bb2ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 223.5 725.5 L 249.5 725.5 L 249.5 750.5 L 223.5 750.5 Z M 223.5 725.5 "/>
 </clipPath>
 <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="#image336"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1608.5 605.5 L 1631.5 605.5 L 1631.5 702.5 L 1608.5 702.5 Z M 265.5 605.5 L 287.5 605.5 L 287.5 702.5 L 265.5 702.5 Z M 328.5 605.5 L 350.5 605.5 L 350.5 702.5 L 328.5 702.5 Z M 391.5 605.5 L 413.5 605.5 L 413.5 702.5 L 391.5 702.5 Z M 453.5 605.5 L 476.5 605.5 L 476.5 702.5 L 453.5 702.5 Z M 516.5 605.5 L 538.5 605.5 L 538.5 702.5 L 516.5 702.5 Z M 579.5 605.5 L 601.5 605.5 L 601.5 702.5 L 579.5 702.5 Z M 642.5 605.5 L 664.5 605.5 L 664.5 702.5 L 642.5 702.5 Z M 704.5 605.5 L 727.5 605.5 L 727.5 702.5 L 704.5 702.5 Z M 845.5 605.5 L 867.5 605.5 L 867.5 702.5 L 845.5 702.5 Z M 907.5 605.5 L 930.5 605.5 L 930.5 702.5 L 907.5 702.5 Z M 970.5 605.5 L 993.5 605.5 L 993.5 702.5 L 970.5 702.5 Z M 1033.5 605.5 L 1055.5 605.5 L 1055.5 702.5 L 1033.5 702.5 Z M 1169.5 605.5 L 1191.5 605.5 L 1191.5 702.5 L 1169.5 702.5 Z M 1232.5 605.5 L 1254.5 605.5 L 1254.5 702.5 L 1232.5 702.5 Z M 1294.5 605.5 L 1317.5 605.5 L 1317.5 702.5 L 1294.5 702.5 Z M 1357.5 605.5 L 1380.5 605.5 L 1380.5 702.5 L 1357.5 702.5 Z M 1420.5 605.5 L 1442.5 605.5 L 1442.5 702.5 L 1420.5 702.5 Z M 1483.5 605.5 L 1505.5 605.5 L 1505.5 702.5 L 1483.5 702.5 Z M 1545.5 605.5 L 1568.5 605.5 L 1568.5 702.5 L 1545.5 702.5 Z M 1545.5 605.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image337"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1608.5 366.5 L 1631.5 366.5 L 1631.5 516.5 L 1608.5 516.5 Z M 265.5 366.5 L 287.5 366.5 L 287.5 516.5 L 265.5 516.5 Z M 328.5 366.5 L 350.5 366.5 L 350.5 516.5 L 328.5 516.5 Z M 391.5 366.5 L 413.5 366.5 L 413.5 516.5 L 391.5 516.5 Z M 453.5 366.5 L 476.5 366.5 L 476.5 516.5 L 453.5 516.5 Z M 516.5 366.5 L 538.5 366.5 L 538.5 516.5 L 516.5 516.5 Z M 579.5 366.5 L 601.5 366.5 L 601.5 516.5 L 579.5 516.5 Z M 642.5 366.5 L 664.5 366.5 L 664.5 516.5 L 642.5 516.5 Z M 704.5 366.5 L 727.5 366.5 L 727.5 516.5 L 704.5 516.5 Z M 840.5 366.5 L 863.5 366.5 L 863.5 516.5 L 840.5 516.5 Z M 903.5 366.5 L 925.5 366.5 L 925.5 516.5 L 903.5 516.5 Z M 966.5 366.5 L 988.5 366.5 L 988.5 516.5 L 966.5 516.5 Z M 1029.5 366.5 L 1051.5 366.5 L 1051.5 516.5 L 1029.5 516.5 Z M 1169.5 366.5 L 1191.5 366.5 L 1191.5 516.5 L 1169.5 516.5 Z M 1232.5 366.5 L 1254.5 366.5 L 1254.5 516.5 L 1232.5 516.5 Z M 1294.5 366.5 L 1317.5 366.5 L 1317.5 516.5 L 1294.5 516.5 Z M 1357.5 366.5 L 1380.5 366.5 L 1380.5 516.5 L 1357.5 516.5 Z M 1420.5 366.5 L 1442.5 366.5 L 1442.5 516.5 L 1420.5 516.5 Z M 1483.5 366.5 L 1505.5 366.5 L 1505.5 516.5 L 1483.5 516.5 Z M 1545.5 366.5 L 1568.5 366.5 L 1568.5 516.5 L 1545.5 516.5 Z M 1545.5 366.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 223 761 L 249 761 M 223 735 L 249 735 M 223 735 L 223 761 M 249 735 L 249 761 " 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 223 761 L 249 761 M 223 735 L 249 735 M 249 761 L 249 735 M 223 761 L 223 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_1.svg b/cells/o311a/sky130_fd_sc_hd__o311a_1.svg
index ba8705b..91df453 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_1.svg
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" 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="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1315.5 666.5 L 1356.5 666.5 L 1356.5 844.5 L 1315.5 844.5 Z M 568.5 666.5 L 610.5 666.5 L 610.5 844.5 L 568.5 844.5 Z M 780.5 666.5 L 822.5 666.5 L 822.5 844.5 L 780.5 844.5 Z M 920.5 666.5 L 961.5 666.5 L 961.5 844.5 L 920.5 844.5 Z M 1076.5 666.5 L 1117.5 666.5 L 1117.5 844.5 L 1076.5 844.5 Z M 1217.5 666.5 L 1258.5 666.5 L 1258.5 844.5 L 1217.5 844.5 Z M 1217.5 666.5 "/>
 </clipPath>
-<image id="image336" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1315.5 228.5 L 1356.5 228.5 L 1356.5 502.5 L 1315.5 502.5 Z M 568.5 228.5 L 610.5 228.5 L 610.5 502.5 L 568.5 502.5 Z M 780.5 228.5 L 822.5 228.5 L 822.5 502.5 L 780.5 502.5 Z M 920.5 228.5 L 961.5 228.5 L 961.5 502.5 L 920.5 502.5 Z M 1076.5 228.5 L 1117.5 228.5 L 1117.5 502.5 L 1076.5 502.5 Z M 1192.5 228.5 L 1233.5 228.5 L 1233.5 502.5 L 1192.5 502.5 Z M 1192.5 228.5 "/>
 </clipPath>
-<image id="image337" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image338" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 496 938 L 543 938 M 496 892 L 543 892 M 496 892 L 496 938 M 543 892 L 543 938 " 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 496 938 L 543 938 M 496 892 L 543 892 M 543 938 L 543 892 M 496 938 L 496 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_2.svg b/cells/o311a/sky130_fd_sc_hd__o311a_2.svg
index 48ac0f8..f3da38d 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_2.svg
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image367" 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="#image367"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1378.5 666.5 L 1419.5 666.5 L 1419.5 844.5 L 1378.5 844.5 Z M 519.5 666.5 L 560.5 666.5 L 560.5 844.5 L 519.5 844.5 Z M 634.5 666.5 L 675.5 666.5 L 675.5 844.5 L 634.5 844.5 Z M 846.5 666.5 L 887.5 666.5 L 887.5 844.5 L 846.5 844.5 Z M 983.5 666.5 L 1024.5 666.5 L 1024.5 844.5 L 983.5 844.5 Z M 1139.5 666.5 L 1180.5 666.5 L 1180.5 844.5 L 1139.5 844.5 Z M 1280.5 666.5 L 1321.5 666.5 L 1321.5 844.5 L 1280.5 844.5 Z M 1280.5 666.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 228.5 L 1419.5 228.5 L 1419.5 502.5 L 1378.5 502.5 Z M 519.5 228.5 L 560.5 228.5 L 560.5 502.5 L 519.5 502.5 Z M 634.5 228.5 L 675.5 228.5 L 675.5 502.5 L 634.5 502.5 Z M 846.5 228.5 L 887.5 228.5 L 887.5 502.5 L 846.5 502.5 Z M 983.5 228.5 L 1024.5 228.5 L 1024.5 502.5 L 983.5 502.5 Z M 1139.5 228.5 L 1180.5 228.5 L 1180.5 502.5 L 1139.5 502.5 Z M 1255.5 228.5 L 1296.5 228.5 L 1296.5 502.5 L 1255.5 502.5 Z M 1255.5 228.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image370"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -191,6 +191,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hd__o311a_4.svg b/cells/o311a/sky130_fd_sc_hd__o311a_4.svg
index f3e2934..6a83bf6 100644
--- a/cells/o311a/sky130_fd_sc_hd__o311a_4.svg
+++ b/cells/o311a/sky130_fd_sc_hd__o311a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image367" 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="#image367"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1599.5 626.5 L 1628.5 626.5 L 1628.5 750.5 L 1599.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 707.5 626.5 L 736.5 626.5 L 736.5 750.5 L 707.5 750.5 Z M 788.5 626.5 L 816.5 626.5 L 816.5 750.5 L 788.5 750.5 Z M 868.5 626.5 L 897.5 626.5 L 897.5 750.5 L 868.5 750.5 Z M 948.5 626.5 L 977.5 626.5 L 977.5 750.5 L 948.5 750.5 Z M 1130.5 626.5 L 1159.5 626.5 L 1159.5 750.5 L 1130.5 750.5 Z M 1277.5 626.5 L 1306.5 626.5 L 1306.5 750.5 L 1277.5 750.5 Z M 1358.5 626.5 L 1386.5 626.5 L 1386.5 750.5 L 1358.5 750.5 Z M 1438.5 626.5 L 1467.5 626.5 L 1467.5 750.5 L 1438.5 750.5 Z M 1518.5 626.5 L 1547.5 626.5 L 1547.5 750.5 L 1518.5 750.5 Z M 1518.5 626.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1599.5 320.5 L 1628.5 320.5 L 1628.5 511.5 L 1599.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 673.5 320.5 L 702.5 320.5 L 702.5 511.5 L 673.5 511.5 Z M 753.5 320.5 L 782.5 320.5 L 782.5 511.5 L 753.5 511.5 Z M 834.5 320.5 L 862.5 320.5 L 862.5 511.5 L 834.5 511.5 Z M 914.5 320.5 L 943.5 320.5 L 943.5 511.5 L 914.5 511.5 Z M 1098.5 320.5 L 1126.5 320.5 L 1126.5 511.5 L 1098.5 511.5 Z M 1178.5 320.5 L 1207.5 320.5 L 1207.5 511.5 L 1178.5 511.5 Z M 1358.5 320.5 L 1386.5 320.5 L 1386.5 511.5 L 1358.5 511.5 Z M 1438.5 320.5 L 1467.5 320.5 L 1467.5 511.5 L 1438.5 511.5 Z M 1518.5 320.5 L 1547.5 320.5 L 1547.5 511.5 L 1518.5 511.5 Z M 1518.5 320.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image370"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,5 @@
 <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 239 300 L 272 300 M 239 268 L 272 268 M 239 268 L 239 300 M 272 268 L 272 300 " 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 239 300 L 272 300 M 239 268 L 272 268 M 272 300 L 272 268 M 239 300 L 239 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.svg b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.svg
index 2fa2eaa..86835fd 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_0.svg
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" 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="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1206.5 729.5 L 1247.5 729.5 L 1247.5 844.5 L 1206.5 844.5 Z M 670.5 729.5 L 711.5 729.5 L 711.5 844.5 L 670.5 844.5 Z M 785.5 729.5 L 826.5 729.5 L 826.5 844.5 L 785.5 844.5 Z M 899.5 729.5 L 941.5 729.5 L 941.5 844.5 L 899.5 844.5 Z M 1107.5 729.5 L 1148.5 729.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1107.5 729.5 "/>
 </clipPath>
-<image id="image370" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1206.5 228.5 L 1247.5 228.5 L 1247.5 403.5 L 1206.5 403.5 Z M 670.5 228.5 L 711.5 228.5 L 711.5 403.5 L 670.5 403.5 Z M 785.5 228.5 L 826.5 228.5 L 826.5 403.5 L 785.5 403.5 Z M 899.5 228.5 L 941.5 228.5 L 941.5 403.5 L 899.5 403.5 Z M 1064.5 228.5 L 1105.5 228.5 L 1105.5 403.5 L 1064.5 403.5 Z M 1064.5 228.5 "/>
 </clipPath>
-<image id="image371" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image372" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface366">
+<g id="surface393">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.svg b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.svg
index a1bef2c..69536c6 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_1.svg
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" 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="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <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="#image354"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1206.5 666.5 L 1247.5 666.5 L 1247.5 844.5 L 1206.5 844.5 Z M 670.5 666.5 L 711.5 666.5 L 711.5 844.5 L 670.5 844.5 Z M 785.5 666.5 L 826.5 666.5 L 826.5 844.5 L 785.5 844.5 Z M 899.5 666.5 L 941.5 666.5 L 941.5 844.5 L 899.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1107.5 666.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image355"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1206.5 228.5 L 1247.5 228.5 L 1247.5 502.5 L 1206.5 502.5 Z M 670.5 228.5 L 711.5 228.5 L 711.5 502.5 L 670.5 502.5 Z M 785.5 228.5 L 826.5 228.5 L 826.5 502.5 L 785.5 502.5 Z M 899.5 228.5 L 941.5 228.5 L 941.5 502.5 L 899.5 502.5 Z M 1064.5 228.5 L 1105.5 228.5 L 1105.5 502.5 L 1064.5 502.5 Z M 1064.5 228.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.svg b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.svg
index 48668ae..0021fd0 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_2.svg
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1532.5 653.5 L 1569.5 653.5 L 1569.5 813.5 L 1532.5 813.5 Z M 354.5 653.5 L 391.5 653.5 L 391.5 813.5 L 354.5 813.5 Z M 457.5 653.5 L 494.5 653.5 L 494.5 813.5 L 457.5 813.5 Z M 561.5 653.5 L 598.5 653.5 L 598.5 813.5 L 561.5 813.5 Z M 664.5 653.5 L 701.5 653.5 L 701.5 813.5 L 664.5 813.5 Z M 768.5 653.5 L 805.5 653.5 L 805.5 813.5 L 768.5 813.5 Z M 980.5 653.5 L 1017.5 653.5 L 1017.5 813.5 L 980.5 813.5 Z M 1084.5 653.5 L 1121.5 653.5 L 1121.5 813.5 L 1084.5 813.5 Z M 1187.5 653.5 L 1224.5 653.5 L 1224.5 813.5 L 1187.5 813.5 Z M 1429.5 653.5 L 1466.5 653.5 L 1466.5 813.5 L 1429.5 813.5 Z M 1429.5 653.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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1528.5 258.5 L 1565.5 258.5 L 1565.5 505.5 L 1528.5 505.5 Z M 349.5 258.5 L 386.5 258.5 L 386.5 505.5 L 349.5 505.5 Z M 452.5 258.5 L 489.5 258.5 L 489.5 505.5 L 452.5 505.5 Z M 556.5 258.5 L 593.5 258.5 L 593.5 505.5 L 556.5 505.5 Z M 659.5 258.5 L 696.5 258.5 L 696.5 505.5 L 659.5 505.5 Z M 891.5 258.5 L 928.5 258.5 L 928.5 505.5 L 891.5 505.5 Z M 995.5 258.5 L 1032.5 258.5 L 1032.5 505.5 L 995.5 505.5 Z M 1098.5 258.5 L 1135.5 258.5 L 1135.5 505.5 L 1098.5 505.5 Z M 1286.5 258.5 L 1323.5 258.5 L 1323.5 505.5 L 1286.5 505.5 Z M 1424.5 258.5 L 1461.5 258.5 L 1461.5 505.5 L 1424.5 505.5 Z M 1424.5 258.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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.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="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;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <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 257 229 L 299 229 M 257 187 L 299 187 M 257 187 L 257 229 M 299 187 L 299 229 " 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 257 229 L 299 229 M 257 187 L 299 187 M 299 229 L 299 187 M 257 229 L 257 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.svg b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.svg
index ac254d5..5f63586 100644
--- a/cells/o311ai/sky130_fd_sc_hd__o311ai_4.svg
+++ b/cells/o311ai/sky130_fd_sc_hd__o311ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" 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="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 223.5 734.5 L 250.5 734.5 L 250.5 760.5 L 223.5 760.5 Z M 223.5 734.5 "/>
 </clipPath>
 <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="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1616.5 609.5 L 1640.5 609.5 L 1640.5 710.5 L 1616.5 710.5 Z M 278.5 609.5 L 301.5 609.5 L 301.5 710.5 L 278.5 710.5 Z M 343.5 609.5 L 367.5 609.5 L 367.5 710.5 L 343.5 710.5 Z M 409.5 609.5 L 433.5 609.5 L 433.5 710.5 L 409.5 710.5 Z M 475.5 609.5 L 498.5 609.5 L 498.5 710.5 L 475.5 710.5 Z M 540.5 609.5 L 564.5 609.5 L 564.5 710.5 L 540.5 710.5 Z M 606.5 609.5 L 630.5 609.5 L 630.5 710.5 L 606.5 710.5 Z M 672.5 609.5 L 695.5 609.5 L 695.5 710.5 L 672.5 710.5 Z M 737.5 609.5 L 761.5 609.5 L 761.5 710.5 L 737.5 710.5 Z M 806.5 609.5 L 830.5 609.5 L 830.5 710.5 L 806.5 710.5 Z M 872.5 609.5 L 895.5 609.5 L 895.5 710.5 L 872.5 710.5 Z M 938.5 609.5 L 961.5 609.5 L 961.5 710.5 L 938.5 710.5 Z M 1003.5 609.5 L 1027.5 609.5 L 1027.5 710.5 L 1003.5 710.5 Z M 1156.5 609.5 L 1180.5 609.5 L 1180.5 710.5 L 1156.5 710.5 Z M 1222.5 609.5 L 1246.5 609.5 L 1246.5 710.5 L 1222.5 710.5 Z M 1288.5 609.5 L 1311.5 609.5 L 1311.5 710.5 L 1288.5 710.5 Z M 1353.5 609.5 L 1377.5 609.5 L 1377.5 710.5 L 1353.5 710.5 Z M 1419.5 609.5 L 1443.5 609.5 L 1443.5 710.5 L 1419.5 710.5 Z M 1485.5 609.5 L 1508.5 609.5 L 1508.5 710.5 L 1485.5 710.5 Z M 1551.5 609.5 L 1574.5 609.5 L 1574.5 710.5 L 1551.5 710.5 Z M 1551.5 609.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 358.5 L 1633.5 358.5 L 1633.5 515.5 L 1610.5 515.5 Z M 278.5 358.5 L 301.5 358.5 L 301.5 515.5 L 278.5 515.5 Z M 343.5 358.5 L 367.5 358.5 L 367.5 515.5 L 343.5 515.5 Z M 409.5 358.5 L 433.5 358.5 L 433.5 515.5 L 409.5 515.5 Z M 475.5 358.5 L 498.5 358.5 L 498.5 515.5 L 475.5 515.5 Z M 540.5 358.5 L 564.5 358.5 L 564.5 515.5 L 540.5 515.5 Z M 606.5 358.5 L 630.5 358.5 L 630.5 515.5 L 606.5 515.5 Z M 672.5 358.5 L 695.5 358.5 L 695.5 515.5 L 672.5 515.5 Z M 737.5 358.5 L 761.5 358.5 L 761.5 515.5 L 737.5 515.5 Z M 884.5 358.5 L 908.5 358.5 L 908.5 515.5 L 884.5 515.5 Z M 950.5 358.5 L 974.5 358.5 L 974.5 515.5 L 950.5 515.5 Z M 1016.5 358.5 L 1039.5 358.5 L 1039.5 515.5 L 1016.5 515.5 Z M 1081.5 358.5 L 1105.5 358.5 L 1105.5 515.5 L 1081.5 515.5 Z M 1150.5 358.5 L 1174.5 358.5 L 1174.5 515.5 L 1150.5 515.5 Z M 1216.5 358.5 L 1239.5 358.5 L 1239.5 515.5 L 1216.5 515.5 Z M 1282.5 358.5 L 1305.5 358.5 L 1305.5 515.5 L 1282.5 515.5 Z M 1347.5 358.5 L 1371.5 358.5 L 1371.5 515.5 L 1347.5 515.5 Z M 1413.5 358.5 L 1436.5 358.5 L 1436.5 515.5 L 1413.5 515.5 Z M 1479.5 358.5 L 1502.5 358.5 L 1502.5 515.5 L 1479.5 515.5 Z M 1544.5 358.5 L 1568.5 358.5 L 1568.5 515.5 L 1544.5 515.5 Z M 1544.5 358.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface425">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -229,6 +229,5 @@
 <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 223 345 L 250 345 M 223 319 L 250 319 M 223 319 L 223 345 M 250 319 L 250 345 " 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 223 345 L 250 345 M 223 319 L 250 319 M 250 345 L 250 319 M 223 345 L 223 319 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 329 L 203 334 M 200 332 L 205 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_1.svg b/cells/o31a/sky130_fd_sc_hd__o31a_1.svg
index 2c3edc0..aa03d66 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_1.svg
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image344" 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="#image344"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1204.5 666.5 L 1246.5 666.5 L 1246.5 844.5 L 1204.5 844.5 Z M 679.5 666.5 L 720.5 666.5 L 720.5 844.5 L 679.5 844.5 Z M 827.5 666.5 L 868.5 666.5 L 868.5 844.5 L 827.5 844.5 Z M 942.5 666.5 L 983.5 666.5 L 983.5 844.5 L 942.5 844.5 Z M 1073.5 666.5 L 1114.5 666.5 L 1114.5 844.5 L 1073.5 844.5 Z M 1073.5 666.5 "/>
 </clipPath>
-<image id="image318" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1230.5 228.5 L 1272.5 228.5 L 1272.5 502.5 L 1230.5 502.5 Z M 679.5 228.5 L 720.5 228.5 L 720.5 502.5 L 679.5 502.5 Z M 827.5 228.5 L 868.5 228.5 L 868.5 502.5 L 827.5 502.5 Z M 942.5 228.5 L 983.5 228.5 L 983.5 502.5 L 942.5 502.5 Z M 1073.5 228.5 L 1114.5 228.5 L 1114.5 502.5 L 1073.5 502.5 Z M 1073.5 228.5 "/>
 </clipPath>
-<image id="image319" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image320" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <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 562 938 L 608 938 M 562 892 L 608 892 M 562 892 L 562 938 M 608 892 L 608 938 " 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 562 938 L 608 938 M 562 892 L 608 892 M 608 938 L 608 892 M 562 938 L 562 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_2.svg b/cells/o31a/sky130_fd_sc_hd__o31a_2.svg
index 24408e2..f6c9f4f 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_2.svg
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1267.5 666.5 L 1308.5 666.5 L 1308.5 844.5 L 1267.5 844.5 Z M 605.5 666.5 L 646.5 666.5 L 646.5 844.5 L 605.5 844.5 Z M 742.5 666.5 L 783.5 666.5 L 783.5 844.5 L 742.5 844.5 Z M 890.5 666.5 L 931.5 666.5 L 931.5 844.5 L 890.5 844.5 Z M 1005.5 666.5 L 1046.5 666.5 L 1046.5 844.5 L 1005.5 844.5 Z M 1136.5 666.5 L 1177.5 666.5 L 1177.5 844.5 L 1136.5 844.5 Z M 1136.5 666.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1293.5 228.5 L 1334.5 228.5 L 1334.5 502.5 L 1293.5 502.5 Z M 605.5 228.5 L 646.5 228.5 L 646.5 502.5 L 605.5 502.5 Z M 742.5 228.5 L 783.5 228.5 L 783.5 502.5 L 742.5 502.5 Z M 890.5 228.5 L 931.5 228.5 L 931.5 502.5 L 890.5 502.5 Z M 1005.5 228.5 L 1046.5 228.5 L 1046.5 502.5 L 1005.5 502.5 Z M 1136.5 228.5 L 1177.5 228.5 L 1177.5 502.5 L 1136.5 502.5 Z M 1136.5 228.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hd__o31a_4.svg b/cells/o31a/sky130_fd_sc_hd__o31a_4.svg
index a49f6d7..f323371 100644
--- a/cells/o31a/sky130_fd_sc_hd__o31a_4.svg
+++ b/cells/o31a/sky130_fd_sc_hd__o31a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 179.5 L 1743.5 179.5 L 1743.5 548.5 L 174.5 548.5 Z M 174.5 179.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image382" 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="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 246.5 829.5 L 286.5 829.5 L 286.5 868.5 L 246.5 868.5 Z M 246.5 829.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1538.5 645.5 L 1573.5 645.5 L 1573.5 794.5 L 1538.5 794.5 Z M 335.5 645.5 L 370.5 645.5 L 370.5 794.5 L 335.5 794.5 Z M 432.5 645.5 L 466.5 645.5 L 466.5 794.5 L 432.5 794.5 Z M 535.5 645.5 L 570.5 645.5 L 570.5 794.5 L 535.5 794.5 Z M 632.5 645.5 L 666.5 645.5 L 666.5 794.5 L 632.5 794.5 Z M 853.5 645.5 L 887.5 645.5 L 887.5 794.5 L 853.5 794.5 Z M 949.5 645.5 L 984.5 645.5 L 984.5 794.5 L 949.5 794.5 Z M 1055.5 645.5 L 1090.5 645.5 L 1090.5 794.5 L 1055.5 794.5 Z M 1152.5 645.5 L 1186.5 645.5 L 1186.5 794.5 L 1152.5 794.5 Z M 1248.5 645.5 L 1283.5 645.5 L 1283.5 794.5 L 1248.5 794.5 Z M 1345.5 645.5 L 1379.5 645.5 L 1379.5 794.5 L 1345.5 794.5 Z M 1442.5 645.5 L 1476.5 645.5 L 1476.5 794.5 L 1442.5 794.5 Z M 1442.5 645.5 "/>
 </clipPath>
-<image id="image355" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1538.5 277.5 L 1573.5 277.5 L 1573.5 507.5 L 1538.5 507.5 Z M 335.5 277.5 L 370.5 277.5 L 370.5 507.5 L 335.5 507.5 Z M 432.5 277.5 L 466.5 277.5 L 466.5 507.5 L 432.5 507.5 Z M 535.5 277.5 L 570.5 277.5 L 570.5 507.5 L 535.5 507.5 Z M 632.5 277.5 L 666.5 277.5 L 666.5 507.5 L 632.5 507.5 Z M 728.5 277.5 L 763.5 277.5 L 763.5 507.5 L 728.5 507.5 Z M 830.5 277.5 L 864.5 277.5 L 864.5 507.5 L 830.5 507.5 Z M 1055.5 277.5 L 1090.5 277.5 L 1090.5 507.5 L 1055.5 507.5 Z M 1152.5 277.5 L 1186.5 277.5 L 1186.5 507.5 L 1152.5 507.5 Z M 1248.5 277.5 L 1283.5 277.5 L 1283.5 507.5 L 1248.5 507.5 Z M 1345.5 277.5 L 1379.5 277.5 L 1379.5 507.5 L 1345.5 507.5 Z M 1442.5 277.5 L 1476.5 277.5 L 1476.5 507.5 L 1442.5 507.5 Z M 1442.5 277.5 "/>
 </clipPath>
-<image id="image356" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 203.5 L 290.5 203.5 L 290.5 242.5 L 251.5 242.5 Z M 1627.5 203.5 L 1666.5 203.5 L 1666.5 242.5 L 1627.5 242.5 Z M 1521.5 203.5 L 1560.5 203.5 L 1560.5 242.5 L 1521.5 242.5 Z M 1415.5 203.5 L 1454.5 203.5 L 1454.5 242.5 L 1415.5 242.5 Z M 1309.5 203.5 L 1348.5 203.5 L 1348.5 242.5 L 1309.5 242.5 Z M 1203.5 203.5 L 1243.5 203.5 L 1243.5 242.5 L 1203.5 242.5 Z M 1098.5 203.5 L 1137.5 203.5 L 1137.5 242.5 L 1098.5 242.5 Z M 992.5 203.5 L 1031.5 203.5 L 1031.5 242.5 L 992.5 242.5 Z M 886.5 203.5 L 925.5 203.5 L 925.5 242.5 L 886.5 242.5 Z M 780.5 203.5 L 819.5 203.5 L 819.5 242.5 L 780.5 242.5 Z M 674.5 203.5 L 713.5 203.5 L 713.5 242.5 L 674.5 242.5 Z M 569.5 203.5 L 608.5 203.5 L 608.5 242.5 L 569.5 242.5 Z M 463.5 203.5 L 502.5 203.5 L 502.5 242.5 L 463.5 242.5 Z M 357.5 203.5 L 396.5 203.5 L 396.5 242.5 L 357.5 242.5 Z M 1203.5 320.5 L 1243.5 320.5 L 1243.5 333.5 L 1203.5 333.5 Z M 1203.5 333.5 L 1243.5 333.5 L 1243.5 359.5 L 1203.5 359.5 Z M 1627.5 320.5 L 1666.5 320.5 L 1666.5 359.5 L 1627.5 359.5 Z M 251.5 829.5 L 290.5 829.5 L 290.5 868.5 L 251.5 868.5 Z M 1627.5 829.5 L 1666.5 829.5 L 1666.5 868.5 L 1627.5 868.5 Z M 1521.5 829.5 L 1560.5 829.5 L 1560.5 868.5 L 1521.5 868.5 Z M 1415.5 829.5 L 1454.5 829.5 L 1454.5 868.5 L 1415.5 868.5 Z M 1309.5 829.5 L 1348.5 829.5 L 1348.5 868.5 L 1309.5 868.5 Z M 1203.5 829.5 L 1243.5 829.5 L 1243.5 868.5 L 1203.5 868.5 Z M 1098.5 829.5 L 1137.5 829.5 L 1137.5 868.5 L 1098.5 868.5 Z M 992.5 829.5 L 1031.5 829.5 L 1031.5 868.5 L 992.5 868.5 Z M 886.5 829.5 L 925.5 829.5 L 925.5 868.5 L 886.5 868.5 Z M 780.5 829.5 L 819.5 829.5 L 819.5 868.5 L 780.5 868.5 Z M 674.5 829.5 L 713.5 829.5 L 713.5 868.5 L 674.5 868.5 Z M 569.5 829.5 L 608.5 829.5 L 608.5 868.5 L 569.5 868.5 Z M 463.5 829.5 L 502.5 829.5 L 502.5 868.5 L 463.5 868.5 Z M 357.5 829.5 L 396.5 829.5 L 396.5 868.5 L 357.5 868.5 Z M 357.5 829.5 "/>
 </clipPath>
-<image id="image357" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface351">
+<g id="surface379">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -200,6 +200,5 @@
 <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 246 250 L 286 250 M 246 211 L 286 211 M 246 211 L 246 250 M 286 211 L 286 250 " 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 246 250 L 286 250 M 246 211 L 286 211 M 286 250 L 286 211 M 246 250 L 246 211 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 218 227 L 218 234 M 214 231 L 221 231 " 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 218 226 L 218 235 M 213 231 L 222 231 M 217 232 L 219 232 M 217 230 L 219 230 M 217 230 L 217 232 M 219 230 L 219 232 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.svg b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.svg
index edbc37e..1f4bb58 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_1.svg
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" 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="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <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="#image354"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1131.5 666.5 L 1172.5 666.5 L 1172.5 844.5 L 1131.5 844.5 Z M 693.5 666.5 L 734.5 666.5 L 734.5 844.5 L 693.5 844.5 Z M 808.5 666.5 L 849.5 666.5 L 849.5 844.5 L 808.5 844.5 Z M 923.5 666.5 L 964.5 666.5 L 964.5 844.5 L 923.5 844.5 Z M 923.5 666.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image355"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1178.5 228.5 L 1220.5 228.5 L 1220.5 502.5 L 1178.5 502.5 Z M 693.5 228.5 L 734.5 228.5 L 734.5 502.5 L 693.5 502.5 Z M 808.5 228.5 L 849.5 228.5 L 849.5 502.5 L 808.5 502.5 Z M 923.5 228.5 L 964.5 228.5 L 964.5 502.5 L 923.5 502.5 Z M 923.5 228.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 626 194 L 672 194 M 626 148 L 672 148 M 626 148 L 626 194 M 672 148 L 672 194 " 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 626 194 L 672 194 M 626 148 L 672 148 M 672 194 L 672 148 M 626 194 L 626 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.svg b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.svg
index aea195d..eed642d 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_2.svg
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image337" 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="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <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="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1429.5 666.5 L 1470.5 666.5 L 1470.5 844.5 L 1429.5 844.5 Z M 444.5 666.5 L 485.5 666.5 L 485.5 844.5 L 444.5 844.5 Z M 559.5 666.5 L 600.5 666.5 L 600.5 844.5 L 559.5 844.5 Z M 674.5 666.5 L 715.5 666.5 L 715.5 844.5 L 674.5 844.5 Z M 882.5 666.5 L 923.5 666.5 L 923.5 844.5 L 882.5 844.5 Z M 1029.5 666.5 L 1070.5 666.5 L 1070.5 844.5 L 1029.5 844.5 Z M 1166.5 666.5 L 1207.5 666.5 L 1207.5 844.5 L 1166.5 844.5 Z M 1281.5 666.5 L 1322.5 666.5 L 1322.5 844.5 L 1281.5 844.5 Z M 1281.5 666.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1429.5 228.5 L 1470.5 228.5 L 1470.5 502.5 L 1429.5 502.5 Z M 444.5 228.5 L 485.5 228.5 L 485.5 502.5 L 444.5 502.5 Z M 559.5 228.5 L 600.5 228.5 L 600.5 502.5 L 559.5 502.5 Z M 674.5 228.5 L 715.5 228.5 L 715.5 502.5 L 674.5 502.5 Z M 789.5 228.5 L 830.5 228.5 L 830.5 502.5 L 789.5 502.5 Z M 1051.5 228.5 L 1092.5 228.5 L 1092.5 502.5 L 1051.5 502.5 Z M 1166.5 228.5 L 1207.5 228.5 L 1207.5 502.5 L 1166.5 502.5 Z M 1281.5 228.5 L 1322.5 228.5 L 1322.5 502.5 L 1281.5 502.5 Z M 1281.5 228.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <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 372 194 L 418 194 M 372 148 L 418 148 M 372 148 L 372 194 M 418 148 L 418 194 " 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 372 194 L 418 194 M 372 148 L 418 148 M 418 194 L 418 148 M 372 194 L 372 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.svg b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.svg
index 219a5f3..e474246 100644
--- a/cells/o31ai/sky130_fd_sc_hd__o31ai_4.svg
+++ b/cells/o31ai/sky130_fd_sc_hd__o31ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" 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="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 238.5 779.5 "/>
 </clipPath>
 <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="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1598.5 626.5 L 1627.5 626.5 L 1627.5 750.5 L 1598.5 750.5 Z M 290.5 626.5 L 319.5 626.5 L 319.5 750.5 L 290.5 750.5 Z M 370.5 626.5 L 399.5 626.5 L 399.5 750.5 L 370.5 750.5 Z M 451.5 626.5 L 480.5 626.5 L 480.5 750.5 L 451.5 750.5 Z M 531.5 626.5 L 560.5 626.5 L 560.5 750.5 L 531.5 750.5 Z M 612.5 626.5 L 640.5 626.5 L 640.5 750.5 L 612.5 750.5 Z M 692.5 626.5 L 721.5 626.5 L 721.5 750.5 L 692.5 750.5 Z M 772.5 626.5 L 801.5 626.5 L 801.5 750.5 L 772.5 750.5 Z M 853.5 626.5 L 881.5 626.5 L 881.5 750.5 L 853.5 750.5 Z M 933.5 626.5 L 962.5 626.5 L 962.5 750.5 L 933.5 750.5 Z M 1093.5 626.5 L 1121.5 626.5 L 1121.5 750.5 L 1093.5 750.5 Z M 1173.5 626.5 L 1202.5 626.5 L 1202.5 750.5 L 1173.5 750.5 Z M 1276.5 626.5 L 1305.5 626.5 L 1305.5 750.5 L 1276.5 750.5 Z M 1357.5 626.5 L 1386.5 626.5 L 1386.5 750.5 L 1357.5 750.5 Z M 1437.5 626.5 L 1466.5 626.5 L 1466.5 750.5 L 1437.5 750.5 Z M 1518.5 626.5 L 1546.5 626.5 L 1546.5 750.5 L 1518.5 750.5 Z M 1518.5 626.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1598.5 320.5 L 1627.5 320.5 L 1627.5 511.5 L 1598.5 511.5 Z M 290.5 320.5 L 319.5 320.5 L 319.5 511.5 L 290.5 511.5 Z M 370.5 320.5 L 399.5 320.5 L 399.5 511.5 L 370.5 511.5 Z M 451.5 320.5 L 480.5 320.5 L 480.5 511.5 L 451.5 511.5 Z M 531.5 320.5 L 560.5 320.5 L 560.5 511.5 L 531.5 511.5 Z M 612.5 320.5 L 640.5 320.5 L 640.5 511.5 L 612.5 511.5 Z M 692.5 320.5 L 721.5 320.5 L 721.5 511.5 L 692.5 511.5 Z M 772.5 320.5 L 801.5 320.5 L 801.5 511.5 L 772.5 511.5 Z M 853.5 320.5 L 881.5 320.5 L 881.5 511.5 L 853.5 511.5 Z M 1035.5 320.5 L 1064.5 320.5 L 1064.5 511.5 L 1035.5 511.5 Z M 1116.5 320.5 L 1144.5 320.5 L 1144.5 511.5 L 1116.5 511.5 Z M 1196.5 320.5 L 1225.5 320.5 L 1225.5 511.5 L 1196.5 511.5 Z M 1276.5 320.5 L 1305.5 320.5 L 1305.5 511.5 L 1276.5 511.5 Z M 1357.5 320.5 L 1386.5 320.5 L 1386.5 511.5 L 1357.5 511.5 Z M 1437.5 320.5 L 1466.5 320.5 L 1466.5 511.5 L 1437.5 511.5 Z M 1518.5 320.5 L 1546.5 320.5 L 1546.5 511.5 L 1518.5 511.5 Z M 1518.5 320.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface425">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -237,6 +237,5 @@
 <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 238 300 L 271 300 M 238 268 L 271 268 M 238 268 L 238 300 M 271 268 L 271 300 " 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 238 300 L 271 300 M 238 268 L 271 268 M 271 300 L 271 268 M 238 300 L 238 268 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_1.svg b/cells/o32a/sky130_fd_sc_hd__o32a_1.svg
index fb287e5..f4d921c 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_1.svg
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
 <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="#image355"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1307.5 666.5 L 1348.5 666.5 L 1348.5 844.5 L 1307.5 844.5 Z M 612.5 666.5 L 653.5 666.5 L 653.5 844.5 L 612.5 844.5 Z M 727.5 666.5 L 768.5 666.5 L 768.5 844.5 L 727.5 844.5 Z M 858.5 666.5 L 899.5 666.5 L 899.5 844.5 L 858.5 844.5 Z M 1006.5 666.5 L 1047.5 666.5 L 1047.5 844.5 L 1006.5 844.5 Z M 1154.5 666.5 L 1195.5 666.5 L 1195.5 844.5 L 1154.5 844.5 Z M 1154.5 666.5 "/>
 </clipPath>
-<image id="image328" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1307.5 228.5 L 1348.5 228.5 L 1348.5 502.5 L 1307.5 502.5 Z M 612.5 228.5 L 653.5 228.5 L 653.5 502.5 L 612.5 502.5 Z M 727.5 228.5 L 768.5 228.5 L 768.5 502.5 L 727.5 502.5 Z M 858.5 228.5 L 899.5 228.5 L 899.5 502.5 L 858.5 502.5 Z M 1006.5 228.5 L 1047.5 228.5 L 1047.5 502.5 L 1006.5 502.5 Z M 1154.5 228.5 L 1195.5 228.5 L 1195.5 502.5 L 1154.5 502.5 Z M 1154.5 228.5 "/>
 </clipPath>
-<image id="image329" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image330" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <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 496 194 L 543 194 M 496 148 L 543 148 M 496 148 L 496 194 M 543 148 L 543 194 " 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 496 194 L 543 194 M 496 148 L 543 148 M 543 194 L 543 148 M 496 194 L 496 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_2.svg b/cells/o32a/sky130_fd_sc_hd__o32a_2.svg
index 818ce0f..c42f537 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_2.svg
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image340" 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="#image340"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1359.5 666.5 L 1400.5 666.5 L 1400.5 844.5 L 1359.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 826.5 666.5 L 867.5 666.5 L 867.5 844.5 L 826.5 844.5 Z M 941.5 666.5 L 982.5 666.5 L 982.5 844.5 L 941.5 844.5 Z M 1099.5 666.5 L 1140.5 666.5 L 1140.5 844.5 L 1099.5 844.5 Z M 1214.5 666.5 L 1255.5 666.5 L 1255.5 844.5 L 1214.5 844.5 Z M 1214.5 666.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1359.5 228.5 L 1400.5 228.5 L 1400.5 502.5 L 1359.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 826.5 228.5 L 867.5 228.5 L 867.5 502.5 L 826.5 502.5 Z M 941.5 228.5 L 982.5 228.5 L 982.5 502.5 L 941.5 502.5 Z M 1099.5 228.5 L 1140.5 228.5 L 1140.5 502.5 L 1099.5 502.5 Z M 1214.5 228.5 L 1255.5 228.5 L 1255.5 502.5 L 1214.5 502.5 Z M 1214.5 228.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hd__o32a_4.svg b/cells/o32a/sky130_fd_sc_hd__o32a_4.svg
index f305162..36aa2b6 100644
--- a/cells/o32a/sky130_fd_sc_hd__o32a_4.svg
+++ b/cells/o32a/sky130_fd_sc_hd__o32a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1558.5 621.5 L 1585.5 621.5 L 1585.5 739.5 L 1558.5 739.5 Z M 281.5 621.5 L 308.5 621.5 L 308.5 739.5 L 281.5 739.5 Z M 357.5 621.5 L 384.5 621.5 L 384.5 739.5 L 357.5 739.5 Z M 433.5 621.5 L 460.5 621.5 L 460.5 739.5 L 433.5 739.5 Z M 509.5 621.5 L 536.5 621.5 L 536.5 739.5 L 509.5 739.5 Z M 589.5 621.5 L 616.5 621.5 L 616.5 739.5 L 589.5 739.5 Z M 665.5 621.5 L 692.5 621.5 L 692.5 739.5 L 665.5 739.5 Z M 926.5 621.5 L 953.5 621.5 L 953.5 739.5 L 926.5 739.5 Z M 1002.5 621.5 L 1029.5 621.5 L 1029.5 739.5 L 1002.5 739.5 Z M 1078.5 621.5 L 1105.5 621.5 L 1105.5 739.5 L 1078.5 739.5 Z M 1159.5 621.5 L 1187.5 621.5 L 1187.5 739.5 L 1159.5 739.5 Z M 1330.5 621.5 L 1357.5 621.5 L 1357.5 739.5 L 1330.5 739.5 Z M 1406.5 621.5 L 1433.5 621.5 L 1433.5 739.5 L 1406.5 739.5 Z M 1482.5 621.5 L 1509.5 621.5 L 1509.5 739.5 L 1482.5 739.5 Z M 1482.5 621.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1558.5 331.5 L 1585.5 331.5 L 1585.5 512.5 L 1558.5 512.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 512.5 L 281.5 512.5 Z M 357.5 331.5 L 384.5 331.5 L 384.5 512.5 L 357.5 512.5 Z M 433.5 331.5 L 460.5 331.5 L 460.5 512.5 L 433.5 512.5 Z M 509.5 331.5 L 536.5 331.5 L 536.5 512.5 L 509.5 512.5 Z M 679.5 331.5 L 706.5 331.5 L 706.5 512.5 L 679.5 512.5 Z M 755.5 331.5 L 783.5 331.5 L 783.5 512.5 L 755.5 512.5 Z M 926.5 331.5 L 953.5 331.5 L 953.5 512.5 L 926.5 512.5 Z M 1002.5 331.5 L 1029.5 331.5 L 1029.5 512.5 L 1002.5 512.5 Z M 1078.5 331.5 L 1105.5 331.5 L 1105.5 512.5 L 1078.5 512.5 Z M 1159.5 331.5 L 1187.5 331.5 L 1187.5 512.5 L 1159.5 512.5 Z M 1330.5 331.5 L 1357.5 331.5 L 1357.5 512.5 L 1330.5 512.5 Z M 1406.5 331.5 L 1433.5 331.5 L 1433.5 512.5 L 1406.5 512.5 Z M 1482.5 331.5 L 1509.5 331.5 L 1509.5 512.5 L 1482.5 512.5 Z M 1482.5 331.5 "/>
 </clipPath>
-<image id="image318" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <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 236 806 L 267 806 M 236 775 L 267 775 M 236 775 L 236 806 M 267 775 L 267 806 " 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 236 806 L 267 806 M 236 775 L 267 775 M 267 806 L 267 775 M 236 806 L 236 775 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.svg b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.svg
index 42523e8..1759bf3 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_1.svg
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1226.5 666.5 L 1267.5 666.5 L 1267.5 844.5 L 1226.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 760.5 666.5 L 801.5 666.5 L 801.5 844.5 L 760.5 844.5 Z M 886.5 666.5 L 927.5 666.5 L 927.5 844.5 L 886.5 844.5 Z M 1111.5 666.5 L 1153.5 666.5 L 1153.5 844.5 L 1111.5 844.5 Z M 1111.5 666.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1226.5 228.5 L 1267.5 228.5 L 1267.5 502.5 L 1226.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 729.5 228.5 L 770.5 228.5 L 770.5 502.5 L 729.5 502.5 Z M 936.5 228.5 L 977.5 228.5 L 977.5 502.5 L 936.5 502.5 Z M 1111.5 228.5 L 1153.5 228.5 L 1153.5 502.5 L 1111.5 502.5 Z M 1111.5 228.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.svg b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.svg
index 0ef7a53..7af99b7 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_2.svg
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1508.5 653.5 L 1545.5 653.5 L 1545.5 813.5 L 1508.5 813.5 Z M 319.5 653.5 L 356.5 653.5 L 356.5 813.5 L 319.5 813.5 Z M 423.5 653.5 L 460.5 653.5 L 460.5 813.5 L 423.5 813.5 Z M 526.5 653.5 L 563.5 653.5 L 563.5 813.5 L 526.5 813.5 Z M 630.5 653.5 L 667.5 653.5 L 667.5 813.5 L 630.5 813.5 Z M 733.5 653.5 L 770.5 653.5 L 770.5 813.5 L 733.5 813.5 Z M 965.5 653.5 L 1002.5 653.5 L 1002.5 813.5 L 965.5 813.5 Z M 1069.5 653.5 L 1106.5 653.5 L 1106.5 813.5 L 1069.5 813.5 Z M 1172.5 653.5 L 1209.5 653.5 L 1209.5 813.5 L 1172.5 813.5 Z M 1404.5 653.5 L 1441.5 653.5 L 1441.5 813.5 L 1404.5 813.5 Z M 1404.5 653.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1528.5 258.5 L 1565.5 258.5 L 1565.5 505.5 L 1528.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 423.5 258.5 L 460.5 258.5 L 460.5 505.5 L 423.5 505.5 Z M 526.5 258.5 L 563.5 258.5 L 563.5 505.5 L 526.5 505.5 Z M 630.5 258.5 L 667.5 258.5 L 667.5 505.5 L 630.5 505.5 Z M 876.5 258.5 L 913.5 258.5 L 913.5 505.5 L 876.5 505.5 Z M 980.5 258.5 L 1017.5 258.5 L 1017.5 505.5 L 980.5 505.5 Z M 1084.5 258.5 L 1121.5 258.5 L 1121.5 505.5 L 1084.5 505.5 Z M 1187.5 258.5 L 1224.5 258.5 L 1224.5 505.5 L 1187.5 505.5 Z M 1424.5 258.5 L 1461.5 258.5 L 1461.5 505.5 L 1424.5 505.5 Z M 1424.5 258.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <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 257 900 L 299 900 M 257 858 L 299 858 M 257 858 L 257 900 M 299 858 L 299 900 " 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 257 900 L 299 900 M 257 858 L 299 858 M 299 900 L 299 858 M 257 900 L 257 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.svg b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.svg
index 808fc7b..e77f0b6 100644
--- a/cells/o32ai/sky130_fd_sc_hd__o32ai_4.svg
+++ b/cells/o32ai/sky130_fd_sc_hd__o32ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image400" 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="#image400"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1626.5 605.5 L 1649.5 605.5 L 1649.5 702.5 L 1626.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 515.5 605.5 L 538.5 605.5 L 538.5 702.5 L 515.5 702.5 Z M 578.5 605.5 L 600.5 605.5 L 600.5 702.5 L 578.5 702.5 Z M 641.5 605.5 L 663.5 605.5 L 663.5 702.5 L 641.5 702.5 Z M 704.5 605.5 L 726.5 605.5 L 726.5 702.5 L 704.5 702.5 Z M 766.5 605.5 L 789.5 605.5 L 789.5 702.5 L 766.5 702.5 Z M 829.5 605.5 L 851.5 605.5 L 851.5 702.5 L 829.5 702.5 Z M 892.5 605.5 L 914.5 605.5 L 914.5 702.5 L 892.5 702.5 Z M 978.5 605.5 L 1001.5 605.5 L 1001.5 702.5 L 978.5 702.5 Z M 1095.5 605.5 L 1117.5 605.5 L 1117.5 702.5 L 1095.5 702.5 Z M 1158.5 605.5 L 1180.5 605.5 L 1180.5 702.5 L 1158.5 702.5 Z M 1220.5 605.5 L 1243.5 605.5 L 1243.5 702.5 L 1220.5 702.5 Z M 1283.5 605.5 L 1306.5 605.5 L 1306.5 702.5 L 1283.5 702.5 Z M 1424.5 605.5 L 1446.5 605.5 L 1446.5 702.5 L 1424.5 702.5 Z M 1486.5 605.5 L 1509.5 605.5 L 1509.5 702.5 L 1486.5 702.5 Z M 1549.5 605.5 L 1572.5 605.5 L 1572.5 702.5 L 1549.5 702.5 Z M 1549.5 605.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1626.5 366.5 L 1649.5 366.5 L 1649.5 516.5 L 1626.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 515.5 366.5 L 538.5 366.5 L 538.5 516.5 L 515.5 516.5 Z M 578.5 366.5 L 600.5 366.5 L 600.5 516.5 L 578.5 516.5 Z M 641.5 366.5 L 663.5 366.5 L 663.5 516.5 L 641.5 516.5 Z M 704.5 366.5 L 726.5 366.5 L 726.5 516.5 L 704.5 516.5 Z M 844.5 366.5 L 866.5 366.5 L 866.5 516.5 L 844.5 516.5 Z M 907.5 366.5 L 929.5 366.5 L 929.5 516.5 L 907.5 516.5 Z M 969.5 366.5 L 992.5 366.5 L 992.5 516.5 L 969.5 516.5 Z M 1032.5 366.5 L 1055.5 366.5 L 1055.5 516.5 L 1032.5 516.5 Z M 1095.5 366.5 L 1117.5 366.5 L 1117.5 516.5 L 1095.5 516.5 Z M 1158.5 366.5 L 1180.5 366.5 L 1180.5 516.5 L 1158.5 516.5 Z M 1220.5 366.5 L 1243.5 366.5 L 1243.5 516.5 L 1220.5 516.5 Z M 1283.5 366.5 L 1306.5 366.5 L 1306.5 516.5 L 1283.5 516.5 Z M 1424.5 366.5 L 1446.5 366.5 L 1446.5 516.5 L 1424.5 516.5 Z M 1486.5 366.5 L 1509.5 366.5 L 1509.5 516.5 L 1486.5 516.5 Z M 1549.5 366.5 L 1572.5 366.5 L 1572.5 516.5 L 1549.5 516.5 Z M 1549.5 366.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image403"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface397">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -205,6 +205,5 @@
 <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 225 761 L 251 761 M 225 735 L 251 735 M 225 735 L 225 761 M 251 735 L 251 761 " 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 225 761 L 251 761 M 225 735 L 251 735 M 251 761 L 251 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_1.svg b/cells/o41a/sky130_fd_sc_hd__o41a_1.svg
index 7713d23..e4fc7df 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_1.svg
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image376" 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="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1348.5 666.5 L 1389.5 666.5 L 1389.5 844.5 L 1348.5 844.5 Z M 536.5 666.5 L 577.5 666.5 L 577.5 844.5 L 536.5 844.5 Z M 793.5 666.5 L 834.5 666.5 L 834.5 844.5 L 793.5 844.5 Z M 908.5 666.5 L 949.5 666.5 L 949.5 844.5 L 908.5 844.5 Z M 1053.5 666.5 L 1094.5 666.5 L 1094.5 844.5 L 1053.5 844.5 Z M 1200.5 666.5 L 1241.5 666.5 L 1241.5 844.5 L 1200.5 844.5 Z M 1200.5 666.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1348.5 228.5 L 1389.5 228.5 L 1389.5 502.5 L 1348.5 502.5 Z M 593.5 228.5 L 634.5 228.5 L 634.5 502.5 L 593.5 502.5 Z M 708.5 228.5 L 749.5 228.5 L 749.5 502.5 L 708.5 502.5 Z M 891.5 228.5 L 932.5 228.5 L 932.5 502.5 L 891.5 502.5 Z M 1053.5 228.5 L 1094.5 228.5 L 1094.5 502.5 L 1053.5 502.5 Z M 1200.5 228.5 L 1241.5 228.5 L 1241.5 502.5 L 1200.5 502.5 Z M 1200.5 228.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface345">
+<g id="surface373">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -196,6 +196,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_2.svg b/cells/o41a/sky130_fd_sc_hd__o41a_2.svg
index 2550ff9..c6d439e 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_2.svg
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" 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="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1380.5 666.5 L 1421.5 666.5 L 1421.5 844.5 L 1380.5 844.5 Z M 439.5 666.5 L 480.5 666.5 L 480.5 844.5 L 439.5 844.5 Z M 553.5 666.5 L 594.5 666.5 L 594.5 844.5 L 553.5 844.5 Z M 827.5 666.5 L 868.5 666.5 L 868.5 844.5 L 827.5 844.5 Z M 968.5 666.5 L 1009.5 666.5 L 1009.5 844.5 L 968.5 844.5 Z M 1106.5 666.5 L 1147.5 666.5 L 1147.5 844.5 L 1106.5 844.5 Z M 1243.5 666.5 L 1284.5 666.5 L 1284.5 844.5 L 1243.5 844.5 Z M 1243.5 666.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1380.5 228.5 L 1421.5 228.5 L 1421.5 502.5 L 1380.5 502.5 Z M 439.5 228.5 L 480.5 228.5 L 480.5 502.5 L 439.5 502.5 Z M 553.5 228.5 L 594.5 228.5 L 594.5 502.5 L 553.5 502.5 Z M 761.5 228.5 L 802.5 228.5 L 802.5 502.5 L 761.5 502.5 Z M 968.5 228.5 L 1009.5 228.5 L 1009.5 502.5 L 968.5 502.5 Z M 1106.5 228.5 L 1147.5 228.5 L 1147.5 502.5 L 1106.5 502.5 Z M 1243.5 228.5 L 1284.5 228.5 L 1284.5 502.5 L 1243.5 502.5 Z M 1243.5 228.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface352">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -200,6 +200,5 @@
 <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 372 938 L 418 938 M 372 892 L 418 892 M 372 892 L 372 938 M 418 892 L 418 938 " 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 372 938 L 418 938 M 372 892 L 418 892 M 418 938 L 418 892 M 372 938 L 372 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hd__o41a_4.svg b/cells/o41a/sky130_fd_sc_hd__o41a_4.svg
index af159db..51a1236 100644
--- a/cells/o41a/sky130_fd_sc_hd__o41a_4.svg
+++ b/cells/o41a/sky130_fd_sc_hd__o41a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 238.5 L 1743.5 238.5 L 1743.5 545.5 L 174.5 545.5 Z M 174.5 238.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image367" 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="#image367"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 239.5 779.5 L 272.5 779.5 L 272.5 811.5 L 239.5 811.5 Z M 239.5 779.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1541.5 626.5 L 1570.5 626.5 L 1570.5 750.5 L 1541.5 750.5 Z M 286.5 626.5 L 315.5 626.5 L 315.5 750.5 L 286.5 750.5 Z M 367.5 626.5 L 395.5 626.5 L 395.5 750.5 L 367.5 750.5 Z M 447.5 626.5 L 476.5 626.5 L 476.5 750.5 L 447.5 750.5 Z M 527.5 626.5 L 556.5 626.5 L 556.5 750.5 L 527.5 750.5 Z M 707.5 626.5 L 736.5 626.5 L 736.5 750.5 L 707.5 750.5 Z M 788.5 626.5 L 816.5 626.5 L 816.5 750.5 L 788.5 750.5 Z M 872.5 626.5 L 900.5 626.5 L 900.5 750.5 L 872.5 750.5 Z M 952.5 626.5 L 981.5 626.5 L 981.5 750.5 L 952.5 750.5 Z M 1033.5 626.5 L 1061.5 626.5 L 1061.5 750.5 L 1033.5 750.5 Z M 1113.5 626.5 L 1142.5 626.5 L 1142.5 750.5 L 1113.5 750.5 Z M 1197.5 626.5 L 1226.5 626.5 L 1226.5 750.5 L 1197.5 750.5 Z M 1342.5 626.5 L 1371.5 626.5 L 1371.5 750.5 L 1342.5 750.5 Z M 1461.5 626.5 L 1490.5 626.5 L 1490.5 750.5 L 1461.5 750.5 Z M 1461.5 626.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1541.5 320.5 L 1570.5 320.5 L 1570.5 511.5 L 1541.5 511.5 Z M 286.5 320.5 L 315.5 320.5 L 315.5 511.5 L 286.5 511.5 Z M 367.5 320.5 L 395.5 320.5 L 395.5 511.5 L 367.5 511.5 Z M 447.5 320.5 L 476.5 320.5 L 476.5 511.5 L 447.5 511.5 Z M 527.5 320.5 L 556.5 320.5 L 556.5 511.5 L 527.5 511.5 Z M 608.5 320.5 L 636.5 320.5 L 636.5 511.5 L 608.5 511.5 Z M 692.5 320.5 L 721.5 320.5 L 721.5 511.5 L 692.5 511.5 Z M 872.5 320.5 L 900.5 320.5 L 900.5 511.5 L 872.5 511.5 Z M 952.5 320.5 L 981.5 320.5 L 981.5 511.5 L 952.5 511.5 Z M 1033.5 320.5 L 1061.5 320.5 L 1061.5 511.5 L 1033.5 511.5 Z M 1113.5 320.5 L 1142.5 320.5 L 1142.5 511.5 L 1113.5 511.5 Z M 1300.5 320.5 L 1329.5 320.5 L 1329.5 511.5 L 1300.5 511.5 Z M 1381.5 320.5 L 1409.5 320.5 L 1409.5 511.5 L 1381.5 511.5 Z M 1461.5 320.5 L 1490.5 320.5 L 1490.5 511.5 L 1461.5 511.5 Z M 1461.5 320.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 258.5 L 271.5 258.5 L 271.5 291.5 L 238.5 291.5 Z M 1647.5 258.5 L 1679.5 258.5 L 1679.5 291.5 L 1647.5 291.5 Z M 1559.5 258.5 L 1591.5 258.5 L 1591.5 291.5 L 1559.5 291.5 Z M 1471.5 258.5 L 1503.5 258.5 L 1503.5 291.5 L 1471.5 291.5 Z M 1383.5 258.5 L 1415.5 258.5 L 1415.5 291.5 L 1383.5 291.5 Z M 1295.5 258.5 L 1327.5 258.5 L 1327.5 291.5 L 1295.5 291.5 Z M 1207.5 258.5 L 1239.5 258.5 L 1239.5 291.5 L 1207.5 291.5 Z M 1119.5 258.5 L 1151.5 258.5 L 1151.5 291.5 L 1119.5 291.5 Z M 1031.5 258.5 L 1063.5 258.5 L 1063.5 291.5 L 1031.5 291.5 Z M 943.5 258.5 L 975.5 258.5 L 975.5 291.5 L 943.5 291.5 Z M 855.5 258.5 L 887.5 258.5 L 887.5 291.5 L 855.5 291.5 Z M 767.5 258.5 L 799.5 258.5 L 799.5 291.5 L 767.5 291.5 Z M 679.5 258.5 L 711.5 258.5 L 711.5 291.5 L 679.5 291.5 Z M 591.5 258.5 L 623.5 258.5 L 623.5 291.5 L 591.5 291.5 Z M 503.5 258.5 L 535.5 258.5 L 535.5 291.5 L 503.5 291.5 Z M 415.5 258.5 L 447.5 258.5 L 447.5 291.5 L 415.5 291.5 Z M 326.5 258.5 L 359.5 258.5 L 359.5 291.5 L 326.5 291.5 Z M 238.5 779.5 L 271.5 779.5 L 271.5 811.5 L 238.5 811.5 Z M 1647.5 779.5 L 1679.5 779.5 L 1679.5 811.5 L 1647.5 811.5 Z M 1559.5 779.5 L 1591.5 779.5 L 1591.5 811.5 L 1559.5 811.5 Z M 1471.5 779.5 L 1503.5 779.5 L 1503.5 811.5 L 1471.5 811.5 Z M 1383.5 779.5 L 1415.5 779.5 L 1415.5 811.5 L 1383.5 811.5 Z M 1295.5 779.5 L 1327.5 779.5 L 1327.5 811.5 L 1295.5 811.5 Z M 1207.5 779.5 L 1239.5 779.5 L 1239.5 811.5 L 1207.5 811.5 Z M 1119.5 779.5 L 1151.5 779.5 L 1151.5 811.5 L 1119.5 811.5 Z M 1031.5 779.5 L 1063.5 779.5 L 1063.5 811.5 L 1031.5 811.5 Z M 943.5 779.5 L 975.5 779.5 L 975.5 811.5 L 943.5 811.5 Z M 855.5 779.5 L 887.5 779.5 L 887.5 811.5 L 855.5 811.5 Z M 767.5 779.5 L 799.5 779.5 L 799.5 811.5 L 767.5 811.5 Z M 679.5 779.5 L 711.5 779.5 L 711.5 811.5 L 679.5 811.5 Z M 591.5 779.5 L 623.5 779.5 L 623.5 811.5 L 591.5 811.5 Z M 503.5 779.5 L 535.5 779.5 L 535.5 811.5 L 503.5 811.5 Z M 415.5 779.5 L 447.5 779.5 L 447.5 811.5 L 415.5 811.5 Z M 326.5 779.5 L 359.5 779.5 L 359.5 811.5 L 326.5 811.5 Z M 326.5 779.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image370"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -187,6 +187,5 @@
 <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 239 821 L 272 821 M 239 788 L 272 788 M 239 788 L 239 821 M 272 788 L 272 821 " 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 239 821 L 272 821 M 239 788 L 272 788 M 272 821 L 272 788 M 239 821 L 239 788 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 211 281 L 211 286 M 208 284 L 213 284 " 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 279 L 211 288 M 206 284 L 215 284 M 210 285 L 212 285 M 210 283 L 212 283 M 210 283 L 210 285 M 212 283 L 212 285 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.svg b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.svg
index 73f04d3..a265602 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_1.svg
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image380" 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="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1209.5 666.5 L 1250.5 666.5 L 1250.5 844.5 L 1209.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 842.5 666.5 L 883.5 666.5 L 883.5 844.5 L 842.5 844.5 Z M 957.5 666.5 L 998.5 666.5 L 998.5 844.5 L 957.5 844.5 Z M 1072.5 666.5 L 1113.5 666.5 L 1113.5 844.5 L 1072.5 844.5 Z M 1072.5 666.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1209.5 228.5 L 1250.5 228.5 L 1250.5 502.5 L 1209.5 502.5 Z M 630.5 228.5 L 671.5 228.5 L 671.5 502.5 L 630.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 957.5 228.5 L 998.5 228.5 L 998.5 502.5 L 957.5 502.5 Z M 1072.5 228.5 L 1113.5 228.5 L 1113.5 502.5 L 1072.5 502.5 Z M 1072.5 228.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface377">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.svg b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.svg
index 26f47c9..e6cb219 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_2.svg
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" 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="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 259.5 850.5 L 301.5 850.5 L 301.5 892.5 L 259.5 892.5 Z M 259.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1518.5 653.5 L 1555.5 653.5 L 1555.5 813.5 L 1518.5 813.5 Z M 319.5 653.5 L 356.5 653.5 L 356.5 813.5 L 319.5 813.5 Z M 423.5 653.5 L 460.5 653.5 L 460.5 813.5 L 423.5 813.5 Z M 655.5 653.5 L 692.5 653.5 L 692.5 813.5 L 655.5 813.5 Z M 758.5 653.5 L 795.5 653.5 L 795.5 813.5 L 758.5 813.5 Z M 862.5 653.5 L 899.5 653.5 L 899.5 813.5 L 862.5 813.5 Z M 965.5 653.5 L 1002.5 653.5 L 1002.5 813.5 L 965.5 813.5 Z M 1207.5 653.5 L 1244.5 653.5 L 1244.5 813.5 L 1207.5 813.5 Z M 1311.5 653.5 L 1348.5 653.5 L 1348.5 813.5 L 1311.5 813.5 Z M 1414.5 653.5 L 1451.5 653.5 L 1451.5 813.5 L 1414.5 813.5 Z M 1414.5 653.5 "/>
 </clipPath>
-<image id="image336" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1518.5 258.5 L 1555.5 258.5 L 1555.5 505.5 L 1518.5 505.5 Z M 319.5 258.5 L 356.5 258.5 L 356.5 505.5 L 319.5 505.5 Z M 423.5 258.5 L 460.5 258.5 L 460.5 505.5 L 423.5 505.5 Z M 655.5 258.5 L 692.5 258.5 L 692.5 505.5 L 655.5 505.5 Z M 758.5 258.5 L 795.5 258.5 L 795.5 505.5 L 758.5 505.5 Z M 862.5 258.5 L 899.5 258.5 L 899.5 505.5 L 862.5 505.5 Z M 965.5 258.5 L 1002.5 258.5 L 1002.5 505.5 L 965.5 505.5 Z M 1207.5 258.5 L 1244.5 258.5 L 1244.5 505.5 L 1207.5 505.5 Z M 1311.5 258.5 L 1348.5 258.5 L 1348.5 505.5 L 1311.5 505.5 Z M 1414.5 258.5 L 1451.5 258.5 L 1451.5 505.5 L 1414.5 505.5 Z M 1414.5 258.5 "/>
 </clipPath>
-<image id="image337" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image338" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <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 259 900 L 301 900 M 259 858 L 301 858 M 259 858 L 259 900 M 301 858 L 301 900 " 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 259 900 L 301 900 M 259 858 L 301 858 M 301 900 L 301 858 M 259 900 L 259 858 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.svg b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.svg
index fd6440a..07f0ab7 100644
--- a/cells/o41ai/sky130_fd_sc_hd__o41ai_4.svg
+++ b/cells/o41ai/sky130_fd_sc_hd__o41ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image431" 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="#image403"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 251.5 725.5 L 251.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1610.5 605.5 L 1632.5 605.5 L 1632.5 702.5 L 1610.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 591.5 605.5 L 613.5 605.5 L 613.5 702.5 L 591.5 702.5 Z M 653.5 605.5 L 676.5 605.5 L 676.5 702.5 L 653.5 702.5 Z M 716.5 605.5 L 739.5 605.5 L 739.5 702.5 L 716.5 702.5 Z M 779.5 605.5 L 801.5 605.5 L 801.5 702.5 L 779.5 702.5 Z M 842.5 605.5 L 864.5 605.5 L 864.5 702.5 L 842.5 702.5 Z M 904.5 605.5 L 927.5 605.5 L 927.5 702.5 L 904.5 702.5 Z M 967.5 605.5 L 990.5 605.5 L 990.5 702.5 L 967.5 702.5 Z M 1030.5 605.5 L 1052.5 605.5 L 1052.5 702.5 L 1030.5 702.5 Z M 1170.5 605.5 L 1193.5 605.5 L 1193.5 702.5 L 1170.5 702.5 Z M 1233.5 605.5 L 1256.5 605.5 L 1256.5 702.5 L 1233.5 702.5 Z M 1296.5 605.5 L 1318.5 605.5 L 1318.5 702.5 L 1296.5 702.5 Z M 1359.5 605.5 L 1381.5 605.5 L 1381.5 702.5 L 1359.5 702.5 Z M 1421.5 605.5 L 1444.5 605.5 L 1444.5 702.5 L 1421.5 702.5 Z M 1484.5 605.5 L 1507.5 605.5 L 1507.5 702.5 L 1484.5 702.5 Z M 1547.5 605.5 L 1569.5 605.5 L 1569.5 702.5 L 1547.5 702.5 Z M 1547.5 605.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1610.5 366.5 L 1632.5 366.5 L 1632.5 516.5 L 1610.5 516.5 Z M 262.5 366.5 L 284.5 366.5 L 284.5 516.5 L 262.5 516.5 Z M 325.5 366.5 L 347.5 366.5 L 347.5 516.5 L 325.5 516.5 Z M 388.5 366.5 L 410.5 366.5 L 410.5 516.5 L 388.5 516.5 Z M 450.5 366.5 L 473.5 366.5 L 473.5 516.5 L 450.5 516.5 Z M 591.5 366.5 L 613.5 366.5 L 613.5 516.5 L 591.5 516.5 Z M 653.5 366.5 L 676.5 366.5 L 676.5 516.5 L 653.5 516.5 Z M 716.5 366.5 L 739.5 366.5 L 739.5 516.5 L 716.5 516.5 Z M 779.5 366.5 L 801.5 366.5 L 801.5 516.5 L 779.5 516.5 Z M 842.5 366.5 L 864.5 366.5 L 864.5 516.5 L 842.5 516.5 Z M 904.5 366.5 L 927.5 366.5 L 927.5 516.5 L 904.5 516.5 Z M 967.5 366.5 L 990.5 366.5 L 990.5 516.5 L 967.5 516.5 Z M 1030.5 366.5 L 1052.5 366.5 L 1052.5 516.5 L 1030.5 516.5 Z M 1170.5 366.5 L 1193.5 366.5 L 1193.5 516.5 L 1170.5 516.5 Z M 1233.5 366.5 L 1256.5 366.5 L 1256.5 516.5 L 1233.5 516.5 Z M 1296.5 366.5 L 1318.5 366.5 L 1318.5 516.5 L 1296.5 516.5 Z M 1359.5 366.5 L 1381.5 366.5 L 1381.5 516.5 L 1359.5 516.5 Z M 1421.5 366.5 L 1444.5 366.5 L 1444.5 516.5 L 1421.5 516.5 Z M 1484.5 366.5 L 1507.5 366.5 L 1507.5 516.5 L 1484.5 516.5 Z M 1547.5 366.5 L 1569.5 366.5 L 1569.5 516.5 L 1547.5 516.5 Z M 1547.5 366.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface400">
+<g id="surface428">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -232,6 +232,5 @@
 <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 225 761 L 251 761 M 225 735 L 251 735 M 225 735 L 225 761 M 251 735 L 251 761 " 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 225 761 L 251 761 M 225 735 L 251 735 M 251 761 L 251 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hd__or2_0.svg b/cells/or2/sky130_fd_sc_hd__or2_0.svg
index 2f8f79a..3e0ae46 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_0.svg
+++ b/cells/or2/sky130_fd_sc_hd__or2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image301" 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="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1043.5 666.5 L 1084.5 666.5 L 1084.5 781.5 L 1043.5 781.5 Z M 796.5 666.5 L 837.5 666.5 L 837.5 781.5 L 796.5 781.5 Z M 910.5 666.5 L 951.5 666.5 L 951.5 781.5 L 910.5 781.5 Z M 910.5 666.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1043.5 248.5 L 1084.5 248.5 L 1084.5 423.5 L 1043.5 423.5 Z M 812.5 308.5 L 853.5 308.5 L 853.5 423.5 L 812.5 423.5 Z M 910.5 308.5 L 951.5 308.5 L 951.5 423.5 L 910.5 423.5 Z M 910.5 308.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface298">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 939 613 L 986 613 M 939 566 L 986 566 M 939 566 L 939 613 M 986 566 L 986 613 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hd__or2_1.svg b/cells/or2/sky130_fd_sc_hd__or2_1.svg
index bd53e63..6226baa 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_1.svg
+++ b/cells/or2/sky130_fd_sc_hd__or2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image301" 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="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1043.5 666.5 L 1084.5 666.5 L 1084.5 844.5 L 1043.5 844.5 Z M 796.5 729.5 L 837.5 729.5 L 837.5 844.5 L 796.5 844.5 Z M 910.5 729.5 L 951.5 729.5 L 951.5 844.5 L 910.5 844.5 Z M 910.5 729.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1043.5 228.5 L 1084.5 228.5 L 1084.5 502.5 L 1043.5 502.5 Z M 812.5 387.5 L 853.5 387.5 L 853.5 502.5 L 812.5 502.5 Z M 910.5 387.5 L 951.5 387.5 L 951.5 502.5 L 910.5 502.5 Z M 910.5 387.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface298">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 687 938 L 734 938 M 687 892 L 734 892 M 687 892 L 687 938 M 734 892 L 734 938 " 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 687 938 L 734 938 M 687 892 L 734 892 M 734 938 L 734 892 M 687 938 L 687 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 939 427 L 986 427 M 939 380 L 986 380 M 939 380 L 939 427 M 986 380 L 986 427 M 687 427 L 734 427 M 687 380 L 734 380 M 687 380 L 687 427 M 734 380 L 734 427 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hd__or2_2.svg b/cells/or2/sky130_fd_sc_hd__or2_2.svg
index f3fce0a..034202f 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_2.svg
+++ b/cells/or2/sky130_fd_sc_hd__or2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image301" 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="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 689.5 885.5 L 735.5 885.5 L 735.5 931.5 L 689.5 931.5 Z M 689.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1124.5 666.5 L 1165.5 666.5 L 1165.5 844.5 L 1124.5 844.5 Z M 756.5 729.5 L 797.5 729.5 L 797.5 844.5 L 756.5 844.5 Z M 871.5 729.5 L 912.5 729.5 L 912.5 844.5 L 871.5 844.5 Z M 1009.5 666.5 L 1050.5 666.5 L 1050.5 844.5 L 1009.5 844.5 Z M 1009.5 666.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1124.5 228.5 L 1165.5 228.5 L 1165.5 502.5 L 1124.5 502.5 Z M 772.5 387.5 L 813.5 387.5 L 813.5 502.5 L 772.5 502.5 Z M 871.5 387.5 L 912.5 387.5 L 912.5 502.5 L 871.5 502.5 Z M 1009.5 228.5 L 1050.5 228.5 L 1050.5 502.5 L 1009.5 502.5 Z M 1009.5 228.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface270">
+<g id="surface298">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 689 194 L 735 194 M 689 148 L 735 148 M 689 148 L 689 194 M 735 148 L 735 194 " 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 689 194 L 735 194 M 689 148 L 735 148 M 735 194 L 735 148 M 689 194 L 689 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 689 427 L 735 427 M 689 380 L 735 380 M 689 380 L 689 427 M 735 380 L 735 427 M 941 427 L 987 427 M 941 380 L 987 380 M 941 380 L 941 427 M 987 380 L 987 427 M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hd__or2_4.svg b/cells/or2/sky130_fd_sc_hd__or2_4.svg
index b9dccb3..6b69270 100644
--- a/cells/or2/sky130_fd_sc_hd__or2_4.svg
+++ b/cells/or2/sky130_fd_sc_hd__or2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image303" 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="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1228.5 666.5 L 1269.5 666.5 L 1269.5 844.5 L 1228.5 844.5 Z M 630.5 666.5 L 671.5 666.5 L 671.5 844.5 L 630.5 844.5 Z M 745.5 666.5 L 786.5 666.5 L 786.5 844.5 L 745.5 844.5 Z M 883.5 666.5 L 924.5 666.5 L 924.5 844.5 L 883.5 844.5 Z M 998.5 666.5 L 1039.5 666.5 L 1039.5 844.5 L 998.5 844.5 Z M 1113.5 666.5 L 1154.5 666.5 L 1154.5 844.5 L 1113.5 844.5 Z M 1113.5 666.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1228.5 228.5 L 1269.5 228.5 L 1269.5 502.5 L 1228.5 502.5 Z M 646.5 228.5 L 687.5 228.5 L 687.5 502.5 L 646.5 502.5 Z M 745.5 228.5 L 786.5 228.5 L 786.5 502.5 L 745.5 502.5 Z M 883.5 228.5 L 924.5 228.5 L 924.5 502.5 L 883.5 502.5 Z M 998.5 228.5 L 1039.5 228.5 L 1039.5 502.5 L 998.5 502.5 Z M 1113.5 228.5 L 1154.5 228.5 L 1154.5 502.5 L 1113.5 502.5 Z M 1113.5 228.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 563 427 L 610 427 M 563 380 L 610 380 M 563 380 L 563 427 M 610 380 L 610 427 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_1.svg b/cells/or2b/sky130_fd_sc_hd__or2b_1.svg
index 871becd..51fa9f4 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_1.svg
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" 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="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 939.5 721.5 L 980.5 721.5 L 980.5 836.5 L 939.5 836.5 Z M 693.5 721.5 L 734.5 721.5 L 734.5 836.5 L 693.5 836.5 Z M 1054.5 721.5 L 1095.5 721.5 L 1095.5 836.5 L 1054.5 836.5 Z M 1188.5 666.5 L 1229.5 666.5 L 1229.5 844.5 L 1188.5 844.5 Z M 1188.5 666.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 228.5 L 1229.5 228.5 L 1229.5 502.5 L 1188.5 502.5 Z M 693.5 387.5 L 734.5 387.5 L 734.5 502.5 L 693.5 502.5 Z M 1054.5 387.5 L 1095.5 387.5 L 1095.5 502.5 L 1054.5 502.5 Z M 956.5 387.5 L 997.5 387.5 L 997.5 502.5 L 956.5 502.5 Z M 956.5 387.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 626 938 L 672 938 M 626 892 L 672 892 M 626 892 L 626 938 M 672 892 L 672 938 " 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 626 938 L 672 938 M 626 892 L 672 892 M 672 938 L 672 892 M 626 938 L 626 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_2.svg b/cells/or2b/sky130_fd_sc_hd__or2b_2.svg
index ea524cf..14bab64 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_2.svg
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" 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="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 990.5 721.5 L 1031.5 721.5 L 1031.5 836.5 L 990.5 836.5 Z M 875.5 721.5 L 916.5 721.5 L 916.5 836.5 L 875.5 836.5 Z M 630.5 721.5 L 671.5 721.5 L 671.5 836.5 L 630.5 836.5 Z M 1124.5 666.5 L 1165.5 666.5 L 1165.5 844.5 L 1124.5 844.5 Z M 1239.5 666.5 L 1280.5 666.5 L 1280.5 844.5 L 1239.5 844.5 Z M 1239.5 666.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1124.5 228.5 L 1165.5 228.5 L 1165.5 502.5 L 1124.5 502.5 Z M 891.5 387.5 L 932.5 387.5 L 932.5 502.5 L 891.5 502.5 Z M 630.5 387.5 L 671.5 387.5 L 671.5 502.5 L 630.5 502.5 Z M 990.5 387.5 L 1031.5 387.5 L 1031.5 502.5 L 990.5 502.5 Z M 1239.5 228.5 L 1280.5 228.5 L 1280.5 502.5 L 1239.5 502.5 Z M 1239.5 228.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 563 938 L 610 938 M 563 892 L 610 892 M 563 892 L 563 938 M 610 892 L 610 938 " 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 563 938 L 610 938 M 563 892 L 610 892 M 610 938 L 610 892 M 563 938 L 563 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hd__or2b_4.svg b/cells/or2b/sky130_fd_sc_hd__or2b_4.svg
index 0d09988..5609638 100644
--- a/cells/or2b/sky130_fd_sc_hd__or2b_4.svg
+++ b/cells/or2b/sky130_fd_sc_hd__or2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 503.5 721.5 L 544.5 721.5 L 544.5 836.5 L 503.5 836.5 Z M 864.5 666.5 L 905.5 666.5 L 905.5 844.5 L 864.5 844.5 Z M 1343.5 666.5 L 1384.5 666.5 L 1384.5 844.5 L 1343.5 844.5 Z M 1113.5 666.5 L 1154.5 666.5 L 1154.5 844.5 L 1113.5 844.5 Z M 998.5 666.5 L 1039.5 666.5 L 1039.5 844.5 L 998.5 844.5 Z M 1228.5 666.5 L 1269.5 666.5 L 1269.5 844.5 L 1228.5 844.5 Z M 749.5 666.5 L 790.5 666.5 L 790.5 844.5 L 749.5 844.5 Z M 749.5 666.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 503.5 228.5 L 544.5 228.5 L 544.5 343.5 L 503.5 343.5 Z M 1113.5 228.5 L 1154.5 228.5 L 1154.5 502.5 L 1113.5 502.5 Z M 765.5 228.5 L 806.5 228.5 L 806.5 502.5 L 765.5 502.5 Z M 864.5 228.5 L 905.5 228.5 L 905.5 502.5 L 864.5 502.5 Z M 998.5 228.5 L 1039.5 228.5 L 1039.5 502.5 L 998.5 502.5 Z M 1343.5 228.5 L 1384.5 228.5 L 1384.5 502.5 L 1343.5 502.5 Z M 1228.5 228.5 L 1269.5 228.5 L 1269.5 502.5 L 1228.5 502.5 Z M 1228.5 228.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,5 @@
 <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 434 938 L 481 938 M 434 892 L 481 892 M 434 892 L 434 938 M 481 892 L 481 938 " 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 434 938 L 481 938 M 434 892 L 481 892 M 481 938 L 481 892 M 434 938 L 434 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 434 613 L 481 613 M 434 566 L 481 566 M 434 566 L 434 613 M 481 566 L 481 613 M 434 706 L 481 706 M 434 659 L 481 659 M 434 659 L 434 706 M 481 659 L 481 706 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hd__or3_1.svg b/cells/or3/sky130_fd_sc_hd__or3_1.svg
index 7b14bec..fe339d1 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_1.svg
+++ b/cells/or3/sky130_fd_sc_hd__or3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 596.5 112.5 L 1329.5 112.5 L 1329.5 551.5 L 596.5 551.5 Z M 596.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 686.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 873.5 721.5 L 915.5 721.5 L 915.5 836.5 L 873.5 836.5 Z M 759.5 721.5 L 800.5 721.5 L 800.5 836.5 L 759.5 836.5 Z M 988.5 721.5 L 1029.5 721.5 L 1029.5 836.5 L 988.5 836.5 Z M 1122.5 666.5 L 1163.5 666.5 L 1163.5 844.5 L 1122.5 844.5 Z M 1122.5 666.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1122.5 228.5 L 1163.5 228.5 L 1163.5 502.5 L 1122.5 502.5 Z M 759.5 387.5 L 800.5 387.5 L 800.5 502.5 L 759.5 502.5 Z M 988.5 387.5 L 1029.5 387.5 L 1029.5 502.5 L 988.5 502.5 Z M 857.5 387.5 L 898.5 387.5 L 898.5 502.5 L 857.5 502.5 Z M 857.5 387.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 813.5 885.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 686 194 L 733 194 M 686 148 L 733 148 M 686 148 L 686 194 M 733 148 L 733 194 " 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 686 194 L 733 194 M 686 148 L 733 148 M 733 194 L 733 148 M 686 194 L 686 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 648 167 L 648 174 M 644 171 L 651 171 " 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 648 166 L 648 175 M 643 171 L 652 171 M 647 172 L 649 172 M 647 170 L 649 170 M 647 170 L 647 172 M 649 170 L 649 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hd__or3_2.svg b/cells/or3/sky130_fd_sc_hd__or3_2.svg
index 5be832e..76e6772 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_2.svg
+++ b/cells/or3/sky130_fd_sc_hd__or3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 625.5 885.5 "/>
 </clipPath>
 <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="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 927.5 721.5 L 968.5 721.5 L 968.5 836.5 L 927.5 836.5 Z M 812.5 721.5 L 853.5 721.5 L 853.5 836.5 L 812.5 836.5 Z M 697.5 721.5 L 738.5 721.5 L 738.5 836.5 L 697.5 836.5 Z M 1061.5 666.5 L 1102.5 666.5 L 1102.5 844.5 L 1061.5 844.5 Z M 1176.5 666.5 L 1217.5 666.5 L 1217.5 844.5 L 1176.5 844.5 Z M 1176.5 666.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1061.5 228.5 L 1102.5 228.5 L 1102.5 502.5 L 1061.5 502.5 Z M 796.5 387.5 L 837.5 387.5 L 837.5 502.5 L 796.5 502.5 Z M 697.5 387.5 L 738.5 387.5 L 738.5 502.5 L 697.5 502.5 Z M 927.5 387.5 L 968.5 387.5 L 968.5 502.5 L 927.5 502.5 Z M 1176.5 228.5 L 1217.5 228.5 L 1217.5 502.5 L 1176.5 502.5 Z M 1176.5 228.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 625 194 L 671 194 M 625 148 L 671 148 M 625 148 L 625 194 M 671 148 L 671 194 " 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 625 194 L 671 194 M 625 148 L 671 148 M 671 194 L 671 148 M 625 194 L 625 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hd__or3_4.svg b/cells/or3/sky130_fd_sc_hd__or3_4.svg
index b7327ff..d53fa4f 100644
--- a/cells/or3/sky130_fd_sc_hd__or3_4.svg
+++ b/cells/or3/sky130_fd_sc_hd__or3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" 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="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1337.5 666.5 L 1378.5 666.5 L 1378.5 844.5 L 1337.5 844.5 Z M 503.5 666.5 L 544.5 666.5 L 544.5 844.5 L 503.5 844.5 Z M 618.5 666.5 L 659.5 666.5 L 659.5 844.5 L 618.5 844.5 Z M 733.5 666.5 L 774.5 666.5 L 774.5 844.5 L 733.5 844.5 Z M 992.5 666.5 L 1034.5 666.5 L 1034.5 844.5 L 992.5 844.5 Z M 1107.5 666.5 L 1148.5 666.5 L 1148.5 844.5 L 1107.5 844.5 Z M 1222.5 666.5 L 1263.5 666.5 L 1263.5 844.5 L 1222.5 844.5 Z M 1222.5 666.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1337.5 228.5 L 1378.5 228.5 L 1378.5 502.5 L 1337.5 502.5 Z M 503.5 228.5 L 544.5 228.5 L 544.5 502.5 L 503.5 502.5 Z M 618.5 228.5 L 659.5 228.5 L 659.5 502.5 L 618.5 502.5 Z M 733.5 228.5 L 774.5 228.5 L 774.5 502.5 L 733.5 502.5 Z M 992.5 228.5 L 1034.5 228.5 L 1034.5 502.5 L 992.5 502.5 Z M 1107.5 228.5 L 1148.5 228.5 L 1148.5 502.5 L 1107.5 502.5 Z M 1222.5 228.5 L 1263.5 228.5 L 1263.5 502.5 L 1222.5 502.5 Z M 1222.5 228.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <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 436 194 L 482 194 M 436 148 L 482 148 M 436 148 L 436 194 M 482 148 L 482 194 " 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 436 194 L 482 194 M 436 148 L 482 148 M 482 194 L 482 148 M 436 194 L 436 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_1.svg b/cells/or3b/sky130_fd_sc_hd__or3b_1.svg
index eb0b9a9..71f1a4e 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_1.svg
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 630.5 666.5 L 671.5 666.5 L 671.5 781.5 L 630.5 781.5 Z M 887.5 721.5 L 928.5 721.5 L 928.5 836.5 L 887.5 836.5 Z M 1117.5 721.5 L 1158.5 721.5 L 1158.5 836.5 L 1117.5 836.5 Z M 1002.5 721.5 L 1043.5 721.5 L 1043.5 836.5 L 1002.5 836.5 Z M 1250.5 666.5 L 1291.5 666.5 L 1291.5 844.5 L 1250.5 844.5 Z M 1250.5 666.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1250.5 228.5 L 1291.5 228.5 L 1291.5 502.5 L 1250.5 502.5 Z M 887.5 387.5 L 928.5 387.5 L 928.5 502.5 L 887.5 502.5 Z M 1116.5 387.5 L 1157.5 387.5 L 1157.5 502.5 L 1116.5 502.5 Z M 986.5 387.5 L 1027.5 387.5 L 1027.5 502.5 L 986.5 502.5 Z M 630.5 387.5 L 671.5 387.5 L 671.5 502.5 L 630.5 502.5 Z M 630.5 387.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_2.svg b/cells/or3b/sky130_fd_sc_hd__or3b_2.svg
index baa5fdd..b2a49f3 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_2.svg
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1127.5 721.5 L 1168.5 721.5 L 1168.5 836.5 L 1127.5 836.5 Z M 1012.5 721.5 L 1053.5 721.5 L 1053.5 836.5 L 1012.5 836.5 Z M 1241.5 721.5 L 1282.5 721.5 L 1282.5 836.5 L 1241.5 836.5 Z M 763.5 666.5 L 804.5 666.5 L 804.5 844.5 L 763.5 844.5 Z M 878.5 666.5 L 919.5 666.5 L 919.5 844.5 L 878.5 844.5 Z M 630.5 729.5 L 671.5 729.5 L 671.5 844.5 L 630.5 844.5 Z M 630.5 729.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 630.5 301.5 L 671.5 301.5 L 671.5 416.5 L 630.5 416.5 Z M 1241.5 387.5 L 1282.5 387.5 L 1282.5 502.5 L 1241.5 502.5 Z M 1127.5 387.5 L 1168.5 387.5 L 1168.5 502.5 L 1127.5 502.5 Z M 1012.5 387.5 L 1053.5 387.5 L 1053.5 502.5 L 1012.5 502.5 Z M 878.5 228.5 L 919.5 228.5 L 919.5 502.5 L 878.5 502.5 Z M 763.5 228.5 L 804.5 228.5 L 804.5 502.5 L 763.5 502.5 Z M 763.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image286" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1318 799 L 1365 799 M 1318 752 L 1365 752 M 1318 752 L 1318 799 M 1365 752 L 1365 799 M 1066 613 L 1113 613 M 1066 566 L 1113 566 M 1066 566 L 1066 613 M 1113 566 L 1113 613 M 563 613 L 610 613 M 563 566 L 610 566 M 563 566 L 563 613 M 610 566 L 610 613 M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hd__or3b_4.svg b/cells/or3b/sky130_fd_sc_hd__or3b_4.svg
index 93dda76..b981d1d 100644
--- a/cells/or3b/sky130_fd_sc_hd__or3b_4.svg
+++ b/cells/or3b/sky130_fd_sc_hd__or3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" 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="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 436.5 885.5 L 482.5 885.5 L 482.5 931.5 L 436.5 931.5 Z M 436.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1210.5 666.5 L 1251.5 666.5 L 1251.5 844.5 L 1210.5 844.5 Z M 503.5 729.5 L 544.5 729.5 L 544.5 844.5 L 503.5 844.5 Z M 1341.5 666.5 L 1382.5 666.5 L 1382.5 844.5 L 1341.5 844.5 Z M 1095.5 666.5 L 1136.5 666.5 L 1136.5 844.5 L 1095.5 844.5 Z M 980.5 666.5 L 1021.5 666.5 L 1021.5 844.5 L 980.5 844.5 Z M 865.5 666.5 L 906.5 666.5 L 906.5 844.5 L 865.5 844.5 Z M 750.5 666.5 L 791.5 666.5 L 791.5 844.5 L 750.5 844.5 Z M 636.5 666.5 L 677.5 666.5 L 677.5 844.5 L 636.5 844.5 Z M 636.5 666.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 503.5 301.5 L 544.5 301.5 L 544.5 416.5 L 503.5 416.5 Z M 865.5 228.5 L 906.5 228.5 L 906.5 502.5 L 865.5 502.5 Z M 1341.5 228.5 L 1382.5 228.5 L 1382.5 502.5 L 1341.5 502.5 Z M 1095.5 228.5 L 1136.5 228.5 L 1136.5 502.5 L 1095.5 502.5 Z M 980.5 228.5 L 1021.5 228.5 L 1021.5 502.5 L 980.5 502.5 Z M 636.5 228.5 L 677.5 228.5 L 677.5 502.5 L 636.5 502.5 Z M 750.5 228.5 L 791.5 228.5 L 791.5 502.5 L 750.5 502.5 Z M 1210.5 228.5 L 1251.5 228.5 L 1251.5 502.5 L 1210.5 502.5 Z M 1210.5 228.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image286" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <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 436 938 L 482 938 M 436 892 L 482 892 M 436 892 L 436 938 M 482 892 L 482 938 " 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 436 938 L 482 938 M 436 892 L 482 892 M 482 938 L 482 892 M 436 938 L 436 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1191 613 L 1237 613 M 1191 566 L 1237 566 M 1191 566 L 1191 613 M 1237 566 L 1237 613 M 436 613 L 482 613 M 436 566 L 482 566 M 436 566 L 436 613 M 482 566 L 482 613 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hd__or4_1.svg b/cells/or4/sky130_fd_sc_hd__or4_1.svg
index 72bfd45..f01e4cb 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_1.svg
+++ b/cells/or4/sky130_fd_sc_hd__or4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 112.5 L 1392.5 112.5 L 1392.5 551.5 L 533.5 551.5 Z M 533.5 112.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" 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="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 626.5 885.5 L 672.5 885.5 L 672.5 931.5 L 626.5 931.5 Z M 626.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 693.5 721.5 L 734.5 721.5 L 734.5 836.5 L 693.5 836.5 Z M 824.5 721.5 L 865.5 721.5 L 865.5 836.5 L 824.5 836.5 Z M 1054.5 721.5 L 1095.5 721.5 L 1095.5 836.5 L 1054.5 836.5 Z M 939.5 721.5 L 980.5 721.5 L 980.5 836.5 L 939.5 836.5 Z M 1188.5 666.5 L 1229.5 666.5 L 1229.5 844.5 L 1188.5 844.5 Z M 1188.5 666.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 228.5 L 1229.5 228.5 L 1229.5 502.5 L 1188.5 502.5 Z M 824.5 387.5 L 865.5 387.5 L 865.5 502.5 L 824.5 502.5 Z M 1054.5 387.5 L 1095.5 387.5 L 1095.5 502.5 L 1054.5 502.5 Z M 923.5 387.5 L 964.5 387.5 L 964.5 502.5 L 923.5 502.5 Z M 693.5 387.5 L 734.5 387.5 L 734.5 502.5 L 693.5 502.5 Z M 693.5 387.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 625.5 141.5 L 671.5 141.5 L 671.5 187.5 L 625.5 187.5 Z M 1254.5 141.5 L 1300.5 141.5 L 1300.5 187.5 L 1254.5 187.5 Z M 1128.5 141.5 L 1174.5 141.5 L 1174.5 187.5 L 1128.5 187.5 Z M 1002.5 141.5 L 1049.5 141.5 L 1049.5 187.5 L 1002.5 187.5 Z M 876.5 141.5 L 923.5 141.5 L 923.5 187.5 L 876.5 187.5 Z M 750.5 141.5 L 797.5 141.5 L 797.5 187.5 L 750.5 187.5 Z M 625.5 885.5 L 671.5 885.5 L 671.5 931.5 L 625.5 931.5 Z M 1254.5 885.5 L 1300.5 885.5 L 1300.5 931.5 L 1254.5 931.5 Z M 1128.5 885.5 L 1174.5 885.5 L 1174.5 931.5 L 1128.5 931.5 Z M 1002.5 885.5 L 1049.5 885.5 L 1049.5 931.5 L 1002.5 931.5 Z M 876.5 885.5 L 923.5 885.5 L 923.5 931.5 L 876.5 931.5 Z M 750.5 885.5 L 797.5 885.5 L 797.5 931.5 L 750.5 931.5 Z M 750.5 885.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 626 194 L 672 194 M 626 148 L 672 148 M 626 148 L 626 194 M 672 148 L 672 194 " 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 626 194 L 672 194 M 626 148 L 672 148 M 672 194 L 672 148 M 626 194 L 626 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 585 167 L 585 174 M 581 171 L 588 171 " 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 585 166 L 585 175 M 580 171 L 589 171 M 584 172 L 586 172 M 584 170 L 586 170 M 584 170 L 584 172 M 586 170 L 586 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hd__or4_2.svg b/cells/or4/sky130_fd_sc_hd__or4_2.svg
index 54ede48..aa4724a 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_2.svg
+++ b/cells/or4/sky130_fd_sc_hd__or4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" 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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 563.5 885.5 L 610.5 885.5 L 610.5 931.5 L 563.5 931.5 Z M 563.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 876.5 721.5 L 917.5 721.5 L 917.5 836.5 L 876.5 836.5 Z M 991.5 721.5 L 1032.5 721.5 L 1032.5 836.5 L 991.5 836.5 Z M 630.5 721.5 L 671.5 721.5 L 671.5 836.5 L 630.5 836.5 Z M 761.5 721.5 L 802.5 721.5 L 802.5 836.5 L 761.5 836.5 Z M 1240.5 666.5 L 1281.5 666.5 L 1281.5 844.5 L 1240.5 844.5 Z M 1125.5 666.5 L 1166.5 666.5 L 1166.5 844.5 L 1125.5 844.5 Z M 1125.5 666.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1125.5 228.5 L 1166.5 228.5 L 1166.5 502.5 L 1125.5 502.5 Z M 761.5 387.5 L 802.5 387.5 L 802.5 502.5 L 761.5 502.5 Z M 630.5 387.5 L 671.5 387.5 L 671.5 502.5 L 630.5 502.5 Z M 991.5 387.5 L 1032.5 387.5 L 1032.5 502.5 L 991.5 502.5 Z M 860.5 387.5 L 901.5 387.5 L 901.5 502.5 L 860.5 502.5 Z M 1240.5 228.5 L 1281.5 228.5 L 1281.5 502.5 L 1240.5 502.5 Z M 1240.5 228.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <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 563 194 L 610 194 M 563 148 L 610 148 M 563 148 L 563 194 M 610 148 L 610 194 " 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 563 194 L 610 194 M 563 148 L 610 148 M 610 194 L 610 148 M 563 194 L 563 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hd__or4_4.svg b/cells/or4/sky130_fd_sc_hd__or4_4.svg
index df1e618..4994a4b 100644
--- a/cells/or4/sky130_fd_sc_hd__or4_4.svg
+++ b/cells/or4/sky130_fd_sc_hd__or4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
 <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="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1374.5 666.5 L 1415.5 666.5 L 1415.5 844.5 L 1374.5 844.5 Z M 510.5 666.5 L 551.5 666.5 L 551.5 844.5 L 510.5 844.5 Z M 655.5 666.5 L 696.5 666.5 L 696.5 844.5 L 655.5 844.5 Z M 770.5 666.5 L 811.5 666.5 L 811.5 844.5 L 770.5 844.5 Z M 884.5 666.5 L 925.5 666.5 L 925.5 844.5 L 884.5 844.5 Z M 1029.5 666.5 L 1070.5 666.5 L 1070.5 844.5 L 1029.5 844.5 Z M 1144.5 666.5 L 1185.5 666.5 L 1185.5 844.5 L 1144.5 844.5 Z M 1259.5 666.5 L 1300.5 666.5 L 1300.5 844.5 L 1259.5 844.5 Z M 1259.5 666.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1374.5 228.5 L 1415.5 228.5 L 1415.5 502.5 L 1374.5 502.5 Z M 510.5 228.5 L 551.5 228.5 L 551.5 502.5 L 510.5 502.5 Z M 655.5 228.5 L 696.5 228.5 L 696.5 502.5 L 655.5 502.5 Z M 770.5 228.5 L 811.5 228.5 L 811.5 502.5 L 770.5 502.5 Z M 884.5 228.5 L 925.5 228.5 L 925.5 502.5 L 884.5 502.5 Z M 1029.5 228.5 L 1070.5 228.5 L 1070.5 502.5 L 1029.5 502.5 Z M 1144.5 228.5 L 1185.5 228.5 L 1185.5 502.5 L 1144.5 502.5 Z M 1259.5 228.5 L 1300.5 228.5 L 1300.5 502.5 L 1259.5 502.5 Z M 1259.5 228.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <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 194 L 480 194 M 433 148 L 480 148 M 433 148 L 433 194 M 480 148 L 480 194 " 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 194 L 480 194 M 433 148 L 480 148 M 480 194 L 480 148 M 433 194 L 433 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 433 427 L 480 427 M 433 380 L 480 380 M 433 380 L 433 427 M 480 380 L 480 427 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_1.svg b/cells/or4b/sky130_fd_sc_hd__or4b_1.svg
index 1fef8a2..647b258 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_1.svg
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 721.5 L 607.5 721.5 L 607.5 836.5 L 566.5 836.5 Z M 823.5 721.5 L 864.5 721.5 L 864.5 836.5 L 823.5 836.5 Z M 1177.5 721.5 L 1218.5 721.5 L 1218.5 836.5 L 1177.5 836.5 Z M 1062.5 721.5 L 1103.5 721.5 L 1103.5 836.5 L 1062.5 836.5 Z M 947.5 721.5 L 988.5 721.5 L 988.5 836.5 L 947.5 836.5 Z M 1311.5 666.5 L 1352.5 666.5 L 1352.5 844.5 L 1311.5 844.5 Z M 1311.5 666.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1311.5 228.5 L 1352.5 228.5 L 1352.5 502.5 L 1311.5 502.5 Z M 823.5 387.5 L 864.5 387.5 L 864.5 502.5 L 823.5 502.5 Z M 1177.5 387.5 L 1218.5 387.5 L 1218.5 502.5 L 1177.5 502.5 Z M 1053.5 387.5 L 1094.5 387.5 L 1094.5 502.5 L 1053.5 502.5 Z M 953.5 387.5 L 994.5 387.5 L 994.5 502.5 L 953.5 502.5 Z M 566.5 387.5 L 607.5 387.5 L 607.5 502.5 L 566.5 502.5 Z M 566.5 387.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface310">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_2.svg b/cells/or4b/sky130_fd_sc_hd__or4b_2.svg
index 7734e61..ca46a1a 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_2.svg
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 406.5 112.5 L 1516.5 112.5 L 1516.5 551.5 L 406.5 551.5 Z M 406.5 112.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image320" 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="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 499.5 885.5 L 545.5 885.5 L 545.5 931.5 L 499.5 931.5 Z M 499.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 566.5 721.5 L 607.5 721.5 L 607.5 836.5 L 566.5 836.5 Z M 1307.5 721.5 L 1348.5 721.5 L 1348.5 836.5 L 1307.5 836.5 Z M 946.5 721.5 L 987.5 721.5 L 987.5 836.5 L 946.5 836.5 Z M 1077.5 721.5 L 1118.5 721.5 L 1118.5 836.5 L 1077.5 836.5 Z M 1192.5 721.5 L 1233.5 721.5 L 1233.5 836.5 L 1192.5 836.5 Z M 698.5 666.5 L 739.5 666.5 L 739.5 844.5 L 698.5 844.5 Z M 813.5 666.5 L 854.5 666.5 L 854.5 844.5 L 813.5 844.5 Z M 813.5 666.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 813.5 228.5 L 854.5 228.5 L 854.5 502.5 L 813.5 502.5 Z M 1307.5 387.5 L 1348.5 387.5 L 1348.5 502.5 L 1307.5 502.5 Z M 1176.5 387.5 L 1217.5 387.5 L 1217.5 502.5 L 1176.5 502.5 Z M 1077.5 387.5 L 1118.5 387.5 L 1118.5 502.5 L 1077.5 502.5 Z M 946.5 387.5 L 987.5 387.5 L 987.5 502.5 L 946.5 502.5 Z M 566.5 387.5 L 607.5 387.5 L 607.5 502.5 L 566.5 502.5 Z M 698.5 228.5 L 739.5 228.5 L 739.5 502.5 L 698.5 502.5 Z M 698.5 228.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 497.5 141.5 L 544.5 141.5 L 544.5 187.5 L 497.5 187.5 Z M 1378.5 141.5 L 1425.5 141.5 L 1425.5 187.5 L 1378.5 187.5 Z M 1252.5 141.5 L 1299.5 141.5 L 1299.5 187.5 L 1252.5 187.5 Z M 1127.5 141.5 L 1173.5 141.5 L 1173.5 187.5 L 1127.5 187.5 Z M 1001.5 141.5 L 1047.5 141.5 L 1047.5 187.5 L 1001.5 187.5 Z M 875.5 141.5 L 921.5 141.5 L 921.5 187.5 L 875.5 187.5 Z M 749.5 141.5 L 796.5 141.5 L 796.5 187.5 L 749.5 187.5 Z M 623.5 141.5 L 670.5 141.5 L 670.5 187.5 L 623.5 187.5 Z M 497.5 885.5 L 544.5 885.5 L 544.5 931.5 L 497.5 931.5 Z M 1378.5 885.5 L 1425.5 885.5 L 1425.5 931.5 L 1378.5 931.5 Z M 1252.5 885.5 L 1299.5 885.5 L 1299.5 931.5 L 1252.5 931.5 Z M 1127.5 885.5 L 1173.5 885.5 L 1173.5 931.5 L 1127.5 931.5 Z M 1001.5 885.5 L 1047.5 885.5 L 1047.5 931.5 L 1001.5 931.5 Z M 875.5 885.5 L 921.5 885.5 L 921.5 931.5 L 875.5 931.5 Z M 749.5 885.5 L 796.5 885.5 L 796.5 931.5 L 749.5 931.5 Z M 623.5 885.5 L 670.5 885.5 L 670.5 931.5 L 623.5 931.5 Z M 623.5 885.5 "/>
 </clipPath>
-<image id="image293" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface317">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <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 499 194 L 545 194 M 499 148 L 545 148 M 499 148 L 499 194 M 545 148 L 545 194 " 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 499 194 L 545 194 M 499 148 L 545 148 M 545 194 L 545 148 M 499 194 L 499 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 458 167 L 458 174 M 454 171 L 461 171 " 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 166 L 458 175 M 453 171 L 462 171 M 457 172 L 459 172 M 457 170 L 459 170 M 457 170 L 457 172 M 459 170 L 459 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hd__or4b_4.svg b/cells/or4b/sky130_fd_sc_hd__or4b_4.svg
index e48cd9c..e032737 100644
--- a/cells/or4b/sky130_fd_sc_hd__or4b_4.svg
+++ b/cells/or4b/sky130_fd_sc_hd__or4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 216.5 112.5 L 1704.5 112.5 L 1704.5 551.5 L 216.5 551.5 Z M 216.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 307.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 376.5 666.5 L 417.5 666.5 L 417.5 781.5 L 376.5 781.5 Z M 1153.5 666.5 L 1194.5 666.5 L 1194.5 844.5 L 1153.5 844.5 Z M 633.5 666.5 L 674.5 666.5 L 674.5 844.5 L 633.5 844.5 Z M 778.5 666.5 L 819.5 666.5 L 819.5 844.5 L 778.5 844.5 Z M 893.5 666.5 L 934.5 666.5 L 934.5 844.5 L 893.5 844.5 Z M 1008.5 666.5 L 1049.5 666.5 L 1049.5 844.5 L 1008.5 844.5 Z M 1382.5 666.5 L 1423.5 666.5 L 1423.5 844.5 L 1382.5 844.5 Z M 1267.5 666.5 L 1308.5 666.5 L 1308.5 844.5 L 1267.5 844.5 Z M 1497.5 666.5 L 1538.5 666.5 L 1538.5 844.5 L 1497.5 844.5 Z M 1497.5 666.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 376.5 228.5 L 417.5 228.5 L 417.5 343.5 L 376.5 343.5 Z M 1153.5 228.5 L 1194.5 228.5 L 1194.5 502.5 L 1153.5 502.5 Z M 633.5 228.5 L 674.5 228.5 L 674.5 502.5 L 633.5 502.5 Z M 778.5 228.5 L 819.5 228.5 L 819.5 502.5 L 778.5 502.5 Z M 893.5 228.5 L 934.5 228.5 L 934.5 502.5 L 893.5 502.5 Z M 1008.5 228.5 L 1049.5 228.5 L 1049.5 502.5 L 1008.5 502.5 Z M 1382.5 228.5 L 1423.5 228.5 L 1423.5 502.5 L 1382.5 502.5 Z M 1267.5 228.5 L 1308.5 228.5 L 1308.5 502.5 L 1267.5 502.5 Z M 1497.5 228.5 L 1538.5 228.5 L 1538.5 502.5 L 1497.5 502.5 Z M 1497.5 228.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 307.5 141.5 L 354.5 141.5 L 354.5 187.5 L 307.5 187.5 Z M 1566.5 141.5 L 1612.5 141.5 L 1612.5 187.5 L 1566.5 187.5 Z M 1440.5 141.5 L 1486.5 141.5 L 1486.5 187.5 L 1440.5 187.5 Z M 1314.5 141.5 L 1360.5 141.5 L 1360.5 187.5 L 1314.5 187.5 Z M 1188.5 141.5 L 1235.5 141.5 L 1235.5 187.5 L 1188.5 187.5 Z M 1062.5 141.5 L 1109.5 141.5 L 1109.5 187.5 L 1062.5 187.5 Z M 936.5 141.5 L 983.5 141.5 L 983.5 187.5 L 936.5 187.5 Z M 811.5 141.5 L 857.5 141.5 L 857.5 187.5 L 811.5 187.5 Z M 685.5 141.5 L 731.5 141.5 L 731.5 187.5 L 685.5 187.5 Z M 559.5 141.5 L 605.5 141.5 L 605.5 187.5 L 559.5 187.5 Z M 433.5 141.5 L 480.5 141.5 L 480.5 187.5 L 433.5 187.5 Z M 307.5 885.5 L 354.5 885.5 L 354.5 931.5 L 307.5 931.5 Z M 1566.5 885.5 L 1612.5 885.5 L 1612.5 931.5 L 1566.5 931.5 Z M 1440.5 885.5 L 1486.5 885.5 L 1486.5 931.5 L 1440.5 931.5 Z M 1314.5 885.5 L 1360.5 885.5 L 1360.5 931.5 L 1314.5 931.5 Z M 1188.5 885.5 L 1235.5 885.5 L 1235.5 931.5 L 1188.5 931.5 Z M 1062.5 885.5 L 1109.5 885.5 L 1109.5 931.5 L 1062.5 931.5 Z M 936.5 885.5 L 983.5 885.5 L 983.5 931.5 L 936.5 931.5 Z M 811.5 885.5 L 857.5 885.5 L 857.5 931.5 L 811.5 931.5 Z M 685.5 885.5 L 731.5 885.5 L 731.5 931.5 L 685.5 931.5 Z M 559.5 885.5 L 605.5 885.5 L 605.5 931.5 L 559.5 931.5 Z M 433.5 885.5 L 480.5 885.5 L 480.5 931.5 L 433.5 931.5 Z M 433.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <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 307 938 L 354 938 M 307 892 L 354 892 M 307 892 L 307 938 M 354 892 L 354 938 " 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 307 938 L 354 938 M 307 892 L 354 892 M 354 938 L 354 892 M 307 938 L 307 892 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 307 613 L 354 613 M 307 566 L 354 566 M 307 566 L 307 613 M 354 566 L 354 613 M 307 706 L 354 706 M 307 659 L 354 659 M 307 659 L 307 706 M 354 659 L 354 706 M 268 167 L 268 174 M 264 171 L 271 171 " 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 268 166 L 268 175 M 263 171 L 272 171 M 267 172 L 269 172 M 267 170 L 269 170 M 267 170 L 267 172 M 269 170 L 269 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.svg b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.svg
index 6a20a35..8c70696 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_1.svg
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 343.5 112.5 L 1579.5 112.5 L 1579.5 551.5 L 343.5 551.5 Z M 343.5 112.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 434.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 512.5 666.5 L 553.5 666.5 L 553.5 781.5 L 512.5 781.5 Z M 634.5 666.5 L 675.5 666.5 L 675.5 781.5 L 634.5 781.5 Z M 1240.5 729.5 L 1281.5 729.5 L 1281.5 844.5 L 1240.5 844.5 Z M 1125.5 729.5 L 1166.5 729.5 L 1166.5 844.5 L 1125.5 844.5 Z M 891.5 729.5 L 932.5 729.5 L 932.5 844.5 L 891.5 844.5 Z M 1374.5 666.5 L 1415.5 666.5 L 1415.5 844.5 L 1374.5 844.5 Z M 1010.5 729.5 L 1051.5 729.5 L 1051.5 844.5 L 1010.5 844.5 Z M 1010.5 729.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 891.5 228.5 L 932.5 228.5 L 932.5 343.5 L 891.5 343.5 Z M 503.5 232.5 L 544.5 232.5 L 544.5 347.5 L 503.5 347.5 Z M 1374.5 228.5 L 1415.5 228.5 L 1415.5 502.5 L 1374.5 502.5 Z M 1023.5 387.5 L 1064.5 387.5 L 1064.5 502.5 L 1023.5 502.5 Z M 1240.5 387.5 L 1281.5 387.5 L 1281.5 502.5 L 1240.5 502.5 Z M 1121.5 387.5 L 1162.5 387.5 L 1162.5 502.5 L 1121.5 502.5 Z M 636.5 387.5 L 677.5 387.5 L 677.5 502.5 L 636.5 502.5 Z M 636.5 387.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 434.5 141.5 L 481.5 141.5 L 481.5 187.5 L 434.5 187.5 Z M 1441.5 141.5 L 1488.5 141.5 L 1488.5 187.5 L 1441.5 187.5 Z M 1315.5 141.5 L 1362.5 141.5 L 1362.5 187.5 L 1315.5 187.5 Z M 1189.5 141.5 L 1236.5 141.5 L 1236.5 187.5 L 1189.5 187.5 Z M 1064.5 141.5 L 1110.5 141.5 L 1110.5 187.5 L 1064.5 187.5 Z M 938.5 141.5 L 984.5 141.5 L 984.5 187.5 L 938.5 187.5 Z M 812.5 141.5 L 858.5 141.5 L 858.5 187.5 L 812.5 187.5 Z M 686.5 141.5 L 733.5 141.5 L 733.5 187.5 L 686.5 187.5 Z M 560.5 141.5 L 607.5 141.5 L 607.5 187.5 L 560.5 187.5 Z M 434.5 885.5 L 481.5 885.5 L 481.5 931.5 L 434.5 931.5 Z M 1441.5 885.5 L 1488.5 885.5 L 1488.5 931.5 L 1441.5 931.5 Z M 1315.5 885.5 L 1362.5 885.5 L 1362.5 931.5 L 1315.5 931.5 Z M 1189.5 885.5 L 1236.5 885.5 L 1236.5 931.5 L 1189.5 931.5 Z M 1064.5 885.5 L 1110.5 885.5 L 1110.5 931.5 L 1064.5 931.5 Z M 938.5 885.5 L 984.5 885.5 L 984.5 931.5 L 938.5 931.5 Z M 812.5 885.5 L 858.5 885.5 L 858.5 931.5 L 812.5 931.5 Z M 686.5 885.5 L 733.5 885.5 L 733.5 931.5 L 686.5 931.5 Z M 560.5 885.5 L 607.5 885.5 L 607.5 931.5 L 560.5 931.5 Z M 560.5 885.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 434 194 L 481 194 M 434 148 L 481 148 M 434 148 L 434 194 M 481 148 L 481 194 " 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 434 194 L 481 194 M 434 148 L 481 148 M 481 194 L 481 148 M 434 194 L 434 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 560 613 L 607 613 M 560 566 L 607 566 M 560 566 L 560 613 M 607 566 L 607 613 M 395 167 L 395 174 M 391 171 L 398 171 " 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 395 166 L 395 175 M 390 171 L 399 171 M 394 172 L 396 172 M 394 170 L 396 170 M 394 170 L 394 172 M 396 170 L 396 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.svg b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.svg
index ac98287..19ad8ca 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_2.svg
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 279.5 112.5 L 1641.5 112.5 L 1641.5 551.5 L 279.5 551.5 Z M 279.5 112.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image323" 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="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 372.5 885.5 L 418.5 885.5 L 418.5 931.5 L 372.5 931.5 Z M 372.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 449.5 666.5 L 491.5 666.5 L 491.5 781.5 L 449.5 781.5 Z M 571.5 666.5 L 612.5 666.5 L 612.5 781.5 L 571.5 781.5 Z M 828.5 729.5 L 869.5 729.5 L 869.5 844.5 L 828.5 844.5 Z M 1183.5 729.5 L 1224.5 729.5 L 1224.5 844.5 L 1183.5 844.5 Z M 1068.5 729.5 L 1109.5 729.5 L 1109.5 844.5 L 1068.5 844.5 Z M 1432.5 666.5 L 1473.5 666.5 L 1473.5 844.5 L 1432.5 844.5 Z M 1317.5 666.5 L 1358.5 666.5 L 1358.5 844.5 L 1317.5 844.5 Z M 953.5 729.5 L 994.5 729.5 L 994.5 844.5 L 953.5 844.5 Z M 953.5 729.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 834.5 228.5 L 875.5 228.5 L 875.5 343.5 L 834.5 343.5 Z M 439.5 232.5 L 480.5 232.5 L 480.5 347.5 L 439.5 347.5 Z M 1432.5 228.5 L 1473.5 228.5 L 1473.5 502.5 L 1432.5 502.5 Z M 965.5 387.5 L 1006.5 387.5 L 1006.5 502.5 L 965.5 502.5 Z M 571.5 387.5 L 612.5 387.5 L 612.5 502.5 L 571.5 502.5 Z M 1183.5 387.5 L 1224.5 387.5 L 1224.5 502.5 L 1183.5 502.5 Z M 1064.5 387.5 L 1105.5 387.5 L 1105.5 502.5 L 1064.5 502.5 Z M 1317.5 228.5 L 1358.5 228.5 L 1358.5 502.5 L 1317.5 502.5 Z M 1317.5 228.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 370.5 141.5 L 417.5 141.5 L 417.5 187.5 L 370.5 187.5 Z M 1503.5 141.5 L 1549.5 141.5 L 1549.5 187.5 L 1503.5 187.5 Z M 1377.5 141.5 L 1423.5 141.5 L 1423.5 187.5 L 1377.5 187.5 Z M 1251.5 141.5 L 1297.5 141.5 L 1297.5 187.5 L 1251.5 187.5 Z M 1125.5 141.5 L 1172.5 141.5 L 1172.5 187.5 L 1125.5 187.5 Z M 999.5 141.5 L 1046.5 141.5 L 1046.5 187.5 L 999.5 187.5 Z M 873.5 141.5 L 920.5 141.5 L 920.5 187.5 L 873.5 187.5 Z M 748.5 141.5 L 794.5 141.5 L 794.5 187.5 L 748.5 187.5 Z M 622.5 141.5 L 668.5 141.5 L 668.5 187.5 L 622.5 187.5 Z M 496.5 141.5 L 543.5 141.5 L 543.5 187.5 L 496.5 187.5 Z M 370.5 885.5 L 417.5 885.5 L 417.5 931.5 L 370.5 931.5 Z M 1503.5 885.5 L 1549.5 885.5 L 1549.5 931.5 L 1503.5 931.5 Z M 1377.5 885.5 L 1423.5 885.5 L 1423.5 931.5 L 1377.5 931.5 Z M 1251.5 885.5 L 1297.5 885.5 L 1297.5 931.5 L 1251.5 931.5 Z M 1125.5 885.5 L 1172.5 885.5 L 1172.5 931.5 L 1125.5 931.5 Z M 999.5 885.5 L 1046.5 885.5 L 1046.5 931.5 L 999.5 931.5 Z M 873.5 885.5 L 920.5 885.5 L 920.5 931.5 L 873.5 931.5 Z M 748.5 885.5 L 794.5 885.5 L 794.5 931.5 L 748.5 931.5 Z M 622.5 885.5 L 668.5 885.5 L 668.5 931.5 L 622.5 931.5 Z M 496.5 885.5 L 543.5 885.5 L 543.5 931.5 L 496.5 931.5 Z M 496.5 885.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,5 @@
 <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 372 194 L 418 194 M 372 148 L 418 148 M 372 148 L 372 194 M 418 148 L 418 194 " 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 372 194 L 418 194 M 372 148 L 418 148 M 418 194 L 418 148 M 372 194 L 372 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 497 613 L 544 613 M 497 566 L 544 566 M 497 566 L 497 613 M 544 566 L 544 613 M 331 167 L 331 174 M 327 171 L 334 171 " 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 331 166 L 331 175 M 326 171 L 335 171 M 330 172 L 332 172 M 330 170 L 332 170 M 330 170 L 330 172 M 332 170 L 332 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.svg b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.svg
index a4453b8..a974caf 100644
--- a/cells/or4bb/sky130_fd_sc_hd__or4bb_4.svg
+++ b/cells/or4bb/sky130_fd_sc_hd__or4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" 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="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 264.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 459.5 662.5 L 498.5 662.5 L 498.5 774.5 L 459.5 774.5 Z M 340.5 662.5 L 380.5 662.5 L 380.5 774.5 L 340.5 774.5 Z M 1214.5 662.5 L 1254.5 662.5 L 1254.5 835.5 L 1214.5 835.5 Z M 709.5 662.5 L 748.5 662.5 L 748.5 835.5 L 709.5 835.5 Z M 849.5 662.5 L 889.5 662.5 L 889.5 835.5 L 849.5 835.5 Z M 961.5 662.5 L 1001.5 662.5 L 1001.5 835.5 L 961.5 835.5 Z M 1549.5 662.5 L 1589.5 662.5 L 1589.5 835.5 L 1549.5 835.5 Z M 1437.5 662.5 L 1477.5 662.5 L 1477.5 835.5 L 1437.5 835.5 Z M 1326.5 662.5 L 1365.5 662.5 L 1365.5 835.5 L 1326.5 835.5 Z M 1073.5 662.5 L 1113.5 662.5 L 1113.5 835.5 L 1073.5 835.5 Z M 1073.5 662.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 331.5 241.5 L 371.5 241.5 L 371.5 352.5 L 331.5 352.5 Z M 849.5 237.5 L 889.5 237.5 L 889.5 503.5 L 849.5 503.5 Z M 460.5 391.5 L 500.5 391.5 L 500.5 503.5 L 460.5 503.5 Z M 1549.5 237.5 L 1589.5 237.5 L 1589.5 503.5 L 1549.5 503.5 Z M 1214.5 237.5 L 1254.5 237.5 L 1254.5 503.5 L 1214.5 503.5 Z M 1073.5 237.5 L 1113.5 237.5 L 1113.5 503.5 L 1073.5 503.5 Z M 961.5 237.5 L 1001.5 237.5 L 1001.5 503.5 L 961.5 503.5 Z M 1437.5 237.5 L 1477.5 237.5 L 1477.5 503.5 L 1437.5 503.5 Z M 714.5 237.5 L 754.5 237.5 L 754.5 503.5 L 714.5 503.5 Z M 1326.5 237.5 L 1365.5 237.5 L 1365.5 503.5 L 1326.5 503.5 Z M 1326.5 237.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -156,6 +156,5 @@
 <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 264 927 L 310 927 M 264 882 L 310 882 M 264 882 L 264 927 M 310 882 L 310 927 " 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 264 927 L 310 927 M 264 882 L 310 882 M 310 927 L 310 882 M 264 927 L 264 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 387 611 L 432 611 M 387 566 L 432 566 M 387 566 L 387 611 M 432 566 L 432 611 M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.svg b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.svg
index aa1a9a4..4cc3c3b 100644
--- a/cells/probe_p/sky130_fd_sc_hd__probe_p_8.svg
+++ b/cells/probe_p/sky130_fd_sc_hd__probe_p_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 124.5 L 1744.5 124.5 L 1744.5 551.5 L 175.5 551.5 Z M 175.5 124.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 266.5 875.5 L 311.5 875.5 L 311.5 920.5 L 266.5 920.5 Z M 266.5 875.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1448.5 662.5 L 1488.5 662.5 L 1488.5 835.5 L 1448.5 835.5 Z M 331.5 662.5 L 371.5 662.5 L 371.5 835.5 L 331.5 835.5 Z M 443.5 662.5 L 482.5 662.5 L 482.5 835.5 L 443.5 835.5 Z M 554.5 662.5 L 594.5 662.5 L 594.5 835.5 L 554.5 835.5 Z M 666.5 662.5 L 706.5 662.5 L 706.5 835.5 L 666.5 835.5 Z M 778.5 662.5 L 818.5 662.5 L 818.5 835.5 L 778.5 835.5 Z M 889.5 662.5 L 929.5 662.5 L 929.5 835.5 L 889.5 835.5 Z M 1001.5 662.5 L 1041.5 662.5 L 1041.5 835.5 L 1001.5 835.5 Z M 1113.5 662.5 L 1153.5 662.5 L 1153.5 835.5 L 1113.5 835.5 Z M 1224.5 662.5 L 1264.5 662.5 L 1264.5 835.5 L 1224.5 835.5 Z M 1336.5 662.5 L 1376.5 662.5 L 1376.5 835.5 L 1336.5 835.5 Z M 1336.5 662.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1448.5 237.5 L 1488.5 237.5 L 1488.5 503.5 L 1448.5 503.5 Z M 331.5 237.5 L 371.5 237.5 L 371.5 503.5 L 331.5 503.5 Z M 443.5 237.5 L 482.5 237.5 L 482.5 503.5 L 443.5 503.5 Z M 554.5 237.5 L 594.5 237.5 L 594.5 503.5 L 554.5 503.5 Z M 666.5 237.5 L 706.5 237.5 L 706.5 503.5 L 666.5 503.5 Z M 778.5 237.5 L 818.5 237.5 L 818.5 503.5 L 778.5 503.5 Z M 889.5 237.5 L 929.5 237.5 L 929.5 503.5 L 889.5 503.5 Z M 1001.5 237.5 L 1041.5 237.5 L 1041.5 503.5 L 1001.5 503.5 Z M 1113.5 237.5 L 1153.5 237.5 L 1153.5 503.5 L 1113.5 503.5 Z M 1224.5 237.5 L 1264.5 237.5 L 1264.5 503.5 L 1224.5 503.5 Z M 1336.5 237.5 L 1376.5 237.5 L 1376.5 503.5 L 1336.5 503.5 Z M 1336.5 237.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="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 558.5 379.5 L 1361.5 379.5 L 1361.5 380.5 L 558.5 380.5 Z M 558.5 379.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <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;"/>
@@ -71,9 +71,9 @@
 <clipPath id="clip12">
   <path d="M 264.5 152.5 L 310.5 152.5 L 310.5 197.5 L 264.5 197.5 Z M 1610.5 152.5 L 1655.5 152.5 L 1655.5 197.5 L 1610.5 197.5 Z M 1488.5 152.5 L 1533.5 152.5 L 1533.5 197.5 L 1488.5 197.5 Z M 1365.5 152.5 L 1411.5 152.5 L 1411.5 197.5 L 1365.5 197.5 Z M 1243.5 152.5 L 1288.5 152.5 L 1288.5 197.5 L 1243.5 197.5 Z M 1121.5 152.5 L 1166.5 152.5 L 1166.5 197.5 L 1121.5 197.5 Z M 998.5 152.5 L 1044.5 152.5 L 1044.5 197.5 L 998.5 197.5 Z M 876.5 152.5 L 921.5 152.5 L 921.5 197.5 L 876.5 197.5 Z M 754.5 152.5 L 799.5 152.5 L 799.5 197.5 L 754.5 197.5 Z M 631.5 152.5 L 677.5 152.5 L 677.5 197.5 L 631.5 197.5 Z M 509.5 152.5 L 554.5 152.5 L 554.5 197.5 L 509.5 197.5 Z M 387.5 152.5 L 432.5 152.5 L 432.5 197.5 L 387.5 197.5 Z M 1375.5 559.5 L 1420.5 559.5 L 1420.5 604.5 L 1375.5 604.5 Z M 1471.5 559.5 L 1516.5 559.5 L 1516.5 604.5 L 1471.5 604.5 Z M 264.5 875.5 L 310.5 875.5 L 310.5 920.5 L 264.5 920.5 Z M 1610.5 875.5 L 1655.5 875.5 L 1655.5 920.5 L 1610.5 920.5 Z M 1488.5 875.5 L 1533.5 875.5 L 1533.5 920.5 L 1488.5 920.5 Z M 1365.5 875.5 L 1411.5 875.5 L 1411.5 920.5 L 1365.5 920.5 Z M 1243.5 875.5 L 1288.5 875.5 L 1288.5 920.5 L 1243.5 920.5 Z M 1121.5 875.5 L 1166.5 875.5 L 1166.5 920.5 L 1121.5 920.5 Z M 998.5 875.5 L 1044.5 875.5 L 1044.5 920.5 L 998.5 920.5 Z M 876.5 875.5 L 921.5 875.5 L 921.5 920.5 L 876.5 920.5 Z M 754.5 875.5 L 799.5 875.5 L 799.5 920.5 L 754.5 920.5 Z M 631.5 875.5 L 677.5 875.5 L 677.5 920.5 L 631.5 920.5 Z M 509.5 875.5 L 554.5 875.5 L 554.5 920.5 L 509.5 920.5 Z M 387.5 875.5 L 432.5 875.5 L 432.5 920.5 L 387.5 920.5 Z M 387.5 875.5 "/>
 </clipPath>
-<image id="image378" 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="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;"/>
@@ -84,9 +84,9 @@
 <clipPath id="clip14">
   <path d="M 1240.5 547.5 L 1310.5 547.5 L 1310.5 616.5 L 1240.5 616.5 Z M 1155.5 547.5 L 1224.5 547.5 L 1224.5 616.5 L 1155.5 616.5 Z M 1155.5 547.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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;"/>
@@ -98,7 +98,7 @@
   <path d="M 1142.5 544.5 L 1217.5 544.5 L 1217.5 547.5 L 1142.5 547.5 Z M 1248.5 544.5 L 1323.5 544.5 L 1323.5 547.5 L 1248.5 547.5 Z M 1248.5 547.5 L 1323.5 547.5 L 1323.5 616.5 L 1248.5 616.5 Z M 1142.5 547.5 L 1217.5 547.5 L 1217.5 616.5 L 1142.5 616.5 Z M 1248.5 616.5 L 1323.5 616.5 L 1323.5 618.5 L 1248.5 618.5 Z M 1142.5 616.5 L 1217.5 616.5 L 1217.5 618.5 L 1142.5 618.5 Z M 1142.5 616.5 "/>
 </clipPath>
 <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="#image403"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
@@ -109,9 +109,9 @@
 <clipPath id="clip18">
   <path d="M 1137.5 539.5 L 1222.5 539.5 L 1222.5 544.5 L 1137.5 544.5 Z M 1243.5 539.5 L 1328.5 539.5 L 1328.5 544.5 L 1243.5 544.5 Z M 1243.5 544.5 L 1328.5 544.5 L 1328.5 618.5 L 1243.5 618.5 Z M 1137.5 544.5 L 1222.5 544.5 L 1222.5 618.5 L 1137.5 618.5 Z M 1243.5 618.5 L 1328.5 618.5 L 1328.5 624.5 L 1243.5 624.5 Z M 1137.5 618.5 L 1222.5 618.5 L 1222.5 624.5 L 1137.5 624.5 Z M 1137.5 618.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
 <pattern id="pattern8" 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="mask8">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
@@ -123,13 +123,13 @@
   <path d="M 1016.5 403.5 L 1330.5 403.5 L 1330.5 539.5 L 1016.5 539.5 Z M 1016.5 539.5 L 1330.5 539.5 L 1330.5 624.5 L 1016.5 624.5 Z M 590.5 403.5 L 904.5 403.5 L 904.5 717.5 L 590.5 717.5 Z M 1016.5 624.5 L 1330.5 624.5 L 1330.5 717.5 L 1016.5 717.5 Z M 1016.5 624.5 "/>
 </clipPath>
 <pattern id="pattern9" 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="mask9">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern9);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface400">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -248,6 +248,5 @@
 <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 266 927 L 311 927 M 266 882 L 311 882 M 266 882 L 266 927 M 311 882 L 311 927 " 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 266 927 L 311 927 M 266 882 L 311 882 M 311 927 L 311 882 M 266 927 L 266 882 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 226 177 L 226 184 M 222 181 L 229 181 " 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 226 176 L 226 185 M 221 181 L 230 181 M 225 182 L 227 182 M 225 180 L 227 180 M 225 180 L 225 182 M 227 180 L 227 182 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.svg b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.svg
index ba6c85e..af9d8f0 100644
--- a/cells/probec_p/sky130_fd_sc_hd__probec_p_8.svg
+++ b/cells/probec_p/sky130_fd_sc_hd__probec_p_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 459.5 268.5 L 1480.5 268.5 L 1480.5 546.5 L 459.5 546.5 Z M 459.5 268.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;"/>
@@ -18,7 +18,7 @@
   <path d="M 517.5 757.5 L 547.5 757.5 L 547.5 786.5 L 517.5 786.5 Z M 517.5 757.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1287.5 619.5 L 1313.5 619.5 L 1313.5 731.5 L 1287.5 731.5 Z M 560.5 619.5 L 586.5 619.5 L 586.5 731.5 L 560.5 731.5 Z M 632.5 619.5 L 658.5 619.5 L 658.5 731.5 L 632.5 731.5 Z M 705.5 619.5 L 731.5 619.5 L 731.5 731.5 L 705.5 731.5 Z M 778.5 619.5 L 804.5 619.5 L 804.5 731.5 L 778.5 731.5 Z M 851.5 619.5 L 877.5 619.5 L 877.5 731.5 L 851.5 731.5 Z M 923.5 619.5 L 949.5 619.5 L 949.5 731.5 L 923.5 731.5 Z M 996.5 619.5 L 1022.5 619.5 L 1022.5 731.5 L 996.5 731.5 Z M 1069.5 619.5 L 1095.5 619.5 L 1095.5 731.5 L 1069.5 731.5 Z M 1141.5 619.5 L 1167.5 619.5 L 1167.5 731.5 L 1141.5 731.5 Z M 1214.5 619.5 L 1240.5 619.5 L 1240.5 731.5 L 1214.5 731.5 Z M 1214.5 619.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1287.5 342.5 L 1313.5 342.5 L 1313.5 515.5 L 1287.5 515.5 Z M 560.5 342.5 L 586.5 342.5 L 586.5 515.5 L 560.5 515.5 Z M 632.5 342.5 L 658.5 342.5 L 658.5 515.5 L 632.5 515.5 Z M 705.5 342.5 L 731.5 342.5 L 731.5 515.5 L 705.5 515.5 Z M 778.5 342.5 L 804.5 342.5 L 804.5 515.5 L 778.5 515.5 Z M 851.5 342.5 L 877.5 342.5 L 877.5 515.5 L 851.5 515.5 Z M 923.5 342.5 L 949.5 342.5 L 949.5 515.5 L 923.5 515.5 Z M 996.5 342.5 L 1022.5 342.5 L 1022.5 515.5 L 996.5 515.5 Z M 1069.5 342.5 L 1095.5 342.5 L 1095.5 515.5 L 1069.5 515.5 Z M 1141.5 342.5 L 1167.5 342.5 L 1167.5 515.5 L 1141.5 515.5 Z M 1214.5 342.5 L 1240.5 342.5 L 1240.5 515.5 L 1214.5 515.5 Z M 1214.5 342.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="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 1246.5 222.5 L 1281.5 222.5 L 1281.5 240.5 L 1246.5 240.5 Z M 1263.5 240.5 L 1281.5 240.5 L 1281.5 257.5 L 1263.5 257.5 Z M 1246.5 257.5 L 1281.5 257.5 L 1281.5 274.5 L 1246.5 274.5 Z M 675.5 398.5 L 692.5 398.5 L 692.5 675.5 L 675.5 675.5 Z M 1246.5 799.5 L 1281.5 799.5 L 1281.5 816.5 L 1246.5 816.5 Z M 1263.5 816.5 L 1281.5 816.5 L 1281.5 833.5 L 1263.5 833.5 Z M 1246.5 833.5 L 1281.5 833.5 L 1281.5 850.5 L 1246.5 850.5 Z M 1246.5 833.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <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;"/>
@@ -71,9 +71,9 @@
 <clipPath id="clip12">
   <path d="M 517.5 286.5 L 546.5 286.5 L 546.5 316.5 L 517.5 316.5 Z M 1392.5 286.5 L 1422.5 286.5 L 1422.5 316.5 L 1392.5 316.5 Z M 1313.5 286.5 L 1342.5 286.5 L 1342.5 316.5 L 1313.5 316.5 Z M 1233.5 286.5 L 1262.5 286.5 L 1262.5 316.5 L 1233.5 316.5 Z M 1153.5 286.5 L 1183.5 286.5 L 1183.5 316.5 L 1153.5 316.5 Z M 1074.5 286.5 L 1103.5 286.5 L 1103.5 316.5 L 1074.5 316.5 Z M 994.5 286.5 L 1024.5 286.5 L 1024.5 316.5 L 994.5 316.5 Z M 915.5 286.5 L 944.5 286.5 L 944.5 316.5 L 915.5 316.5 Z M 835.5 286.5 L 864.5 286.5 L 864.5 316.5 L 835.5 316.5 Z M 755.5 286.5 L 785.5 286.5 L 785.5 316.5 L 755.5 316.5 Z M 676.5 286.5 L 705.5 286.5 L 705.5 316.5 L 676.5 316.5 Z M 596.5 286.5 L 626.5 286.5 L 626.5 316.5 L 596.5 316.5 Z M 1236.5 551.5 L 1266.5 551.5 L 1266.5 580.5 L 1236.5 580.5 Z M 1299.5 551.5 L 1328.5 551.5 L 1328.5 580.5 L 1299.5 580.5 Z M 517.5 757.5 L 546.5 757.5 L 546.5 786.5 L 517.5 786.5 Z M 1392.5 757.5 L 1422.5 757.5 L 1422.5 786.5 L 1392.5 786.5 Z M 1313.5 757.5 L 1342.5 757.5 L 1342.5 786.5 L 1313.5 786.5 Z M 1233.5 757.5 L 1262.5 757.5 L 1262.5 786.5 L 1233.5 786.5 Z M 1153.5 757.5 L 1183.5 757.5 L 1183.5 786.5 L 1153.5 786.5 Z M 1074.5 757.5 L 1103.5 757.5 L 1103.5 786.5 L 1074.5 786.5 Z M 994.5 757.5 L 1024.5 757.5 L 1024.5 786.5 L 994.5 786.5 Z M 915.5 757.5 L 944.5 757.5 L 944.5 786.5 L 915.5 786.5 Z M 835.5 757.5 L 864.5 757.5 L 864.5 786.5 L 835.5 786.5 Z M 755.5 757.5 L 785.5 757.5 L 785.5 786.5 L 755.5 786.5 Z M 676.5 757.5 L 705.5 757.5 L 705.5 786.5 L 676.5 786.5 Z M 596.5 757.5 L 626.5 757.5 L 626.5 786.5 L 596.5 786.5 Z M 596.5 757.5 "/>
 </clipPath>
-<image id="image378" 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="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;"/>
@@ -84,9 +84,9 @@
 <clipPath id="clip14">
   <path d="M 1397.5 278.5 L 1442.5 278.5 L 1442.5 286.5 L 1397.5 286.5 Z M 1397.5 286.5 L 1442.5 286.5 L 1442.5 316.5 L 1397.5 316.5 Z M 1397.5 316.5 L 1442.5 316.5 L 1442.5 323.5 L 1397.5 323.5 Z M 1452.5 278.5 L 1497.5 278.5 L 1497.5 323.5 L 1452.5 323.5 Z M 846.5 543.5 L 891.5 543.5 L 891.5 588.5 L 846.5 588.5 Z M 902.5 543.5 L 947.5 543.5 L 947.5 588.5 L 902.5 588.5 Z M 1397.5 749.5 L 1442.5 749.5 L 1442.5 757.5 L 1397.5 757.5 Z M 1397.5 757.5 L 1442.5 757.5 L 1442.5 786.5 L 1397.5 786.5 Z M 1397.5 786.5 L 1442.5 786.5 L 1442.5 794.5 L 1397.5 794.5 Z M 1452.5 749.5 L 1497.5 749.5 L 1497.5 794.5 L 1452.5 794.5 Z M 1452.5 749.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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;"/>
@@ -98,7 +98,7 @@
   <path d="M 1388.5 277.5 L 1436.5 277.5 L 1436.5 278.5 L 1388.5 278.5 Z M 1457.5 277.5 L 1506.5 277.5 L 1506.5 278.5 L 1457.5 278.5 Z M 1457.5 278.5 L 1506.5 278.5 L 1506.5 323.5 L 1457.5 323.5 Z M 1388.5 278.5 L 1436.5 278.5 L 1436.5 323.5 L 1388.5 323.5 Z M 1457.5 323.5 L 1506.5 323.5 L 1506.5 325.5 L 1457.5 325.5 Z M 1388.5 323.5 L 1436.5 323.5 L 1436.5 325.5 L 1388.5 325.5 Z M 826.5 542.5 L 875.5 542.5 L 875.5 543.5 L 826.5 543.5 Z M 896.5 542.5 L 944.5 542.5 L 944.5 543.5 L 896.5 543.5 Z M 896.5 543.5 L 944.5 543.5 L 944.5 588.5 L 896.5 588.5 Z M 826.5 543.5 L 875.5 543.5 L 875.5 588.5 L 826.5 588.5 Z M 896.5 588.5 L 944.5 588.5 L 944.5 590.5 L 896.5 590.5 Z M 826.5 588.5 L 875.5 588.5 L 875.5 590.5 L 826.5 590.5 Z M 1388.5 747.5 L 1436.5 747.5 L 1436.5 749.5 L 1388.5 749.5 Z M 1457.5 747.5 L 1506.5 747.5 L 1506.5 749.5 L 1457.5 749.5 Z M 1457.5 749.5 L 1506.5 749.5 L 1506.5 794.5 L 1457.5 794.5 Z M 1388.5 749.5 L 1436.5 749.5 L 1436.5 794.5 L 1388.5 794.5 Z M 1457.5 794.5 L 1506.5 794.5 L 1506.5 796.5 L 1457.5 796.5 Z M 1388.5 794.5 L 1436.5 794.5 L 1436.5 796.5 L 1388.5 796.5 Z M 1388.5 794.5 "/>
 </clipPath>
 <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="#image403"/>
 </pattern>
 <mask id="mask7">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern7);stroke:none;"/>
@@ -109,9 +109,9 @@
 <clipPath id="clip18">
   <path d="M 1384.5 273.5 L 1440.5 273.5 L 1440.5 277.5 L 1384.5 277.5 Z M 1454.5 273.5 L 1509.5 273.5 L 1509.5 277.5 L 1454.5 277.5 Z M 1454.5 277.5 L 1509.5 277.5 L 1509.5 325.5 L 1454.5 325.5 Z M 1384.5 277.5 L 1440.5 277.5 L 1440.5 325.5 L 1384.5 325.5 Z M 1454.5 325.5 L 1509.5 325.5 L 1509.5 329.5 L 1454.5 329.5 Z M 1384.5 325.5 L 1440.5 325.5 L 1440.5 329.5 L 1384.5 329.5 Z M 823.5 538.5 L 878.5 538.5 L 878.5 542.5 L 823.5 542.5 Z M 892.5 538.5 L 947.5 538.5 L 947.5 542.5 L 892.5 542.5 Z M 892.5 542.5 L 947.5 542.5 L 947.5 590.5 L 892.5 590.5 Z M 823.5 542.5 L 878.5 542.5 L 878.5 590.5 L 823.5 590.5 Z M 823.5 590.5 L 878.5 590.5 L 878.5 593.5 L 823.5 593.5 Z M 892.5 590.5 L 947.5 590.5 L 947.5 593.5 L 892.5 593.5 Z M 373.5 538.5 L 428.5 538.5 L 428.5 593.5 L 373.5 593.5 Z M 442.5 538.5 L 498.5 538.5 L 498.5 593.5 L 442.5 593.5 Z M 1384.5 744.5 L 1440.5 744.5 L 1440.5 747.5 L 1384.5 747.5 Z M 1454.5 744.5 L 1509.5 744.5 L 1509.5 747.5 L 1454.5 747.5 Z M 1454.5 747.5 L 1509.5 747.5 L 1509.5 796.5 L 1454.5 796.5 Z M 1384.5 747.5 L 1440.5 747.5 L 1440.5 796.5 L 1384.5 796.5 Z M 1454.5 796.5 L 1509.5 796.5 L 1509.5 799.5 L 1454.5 799.5 Z M 1384.5 796.5 L 1440.5 796.5 L 1440.5 799.5 L 1384.5 799.5 Z M 1384.5 796.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7dAxCoAAEAPBCfj/L8dCrPQQrK9YtkkRNhpKBtOWzlaq/+1rd0Cu5aujhGbw/XMk22E7bIcHJ/xmPzD2v5kuAAAAAElFTkSuQmCC"/>
 <pattern id="pattern8" 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="mask8">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern8);stroke:none;"/>
@@ -123,13 +123,13 @@
   <path d="M 1345.5 146.5 L 1549.5 146.5 L 1549.5 273.5 L 1345.5 273.5 Z M 1345.5 273.5 L 1549.5 273.5 L 1549.5 329.5 L 1345.5 329.5 Z M 1345.5 329.5 L 1549.5 329.5 L 1549.5 350.5 L 1345.5 350.5 Z M 294.5 434.5 L 498.5 434.5 L 498.5 538.5 L 294.5 538.5 Z M 744.5 434.5 L 948.5 434.5 L 948.5 538.5 L 744.5 538.5 Z M 744.5 538.5 L 948.5 538.5 L 948.5 593.5 L 744.5 593.5 Z M 294.5 538.5 L 498.5 538.5 L 498.5 593.5 L 294.5 593.5 Z M 294.5 593.5 L 498.5 593.5 L 498.5 638.5 L 294.5 638.5 Z M 744.5 593.5 L 948.5 593.5 L 948.5 638.5 L 744.5 638.5 Z M 1345.5 722.5 L 1549.5 722.5 L 1549.5 744.5 L 1345.5 744.5 Z M 1345.5 744.5 L 1549.5 744.5 L 1549.5 799.5 L 1345.5 799.5 Z M 1345.5 799.5 L 1549.5 799.5 L 1549.5 927.5 L 1345.5 927.5 Z M 1345.5 799.5 "/>
 </clipPath>
 <pattern id="pattern9" 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="mask9">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern9);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface400">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -248,6 +248,5 @@
 <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 517 793 L 547 793 M 517 763 L 547 763 M 517 763 L 517 793 M 547 763 L 547 793 " 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 517 793 L 547 793 M 517 763 L 547 763 M 547 793 L 547 763 M 517 793 L 517 763 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 491 304 L 491 309 M 488 307 L 493 307 " 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 491 302 L 491 311 M 486 307 L 495 307 M 490 308 L 492 308 M 490 306 L 492 306 M 490 306 L 490 308 M 492 306 L 492 308 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.svg b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.svg
index 623d3bc..5b7004a 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.svg
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 367.5 L 1743.5 367.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 367.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image485" 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="#image458"/>
+  <use xlink:href="#image485"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 210.5 670.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image485"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1513.5 585.5 L 1529.5 585.5 L 1529.5 654.5 L 1513.5 654.5 Z M 1155.5 616.5 L 1171.5 616.5 L 1171.5 654.5 L 1155.5 654.5 Z M 1097.5 616.5 L 1113.5 616.5 L 1113.5 654.5 L 1097.5 654.5 Z M 730.5 616.5 L 746.5 616.5 L 746.5 654.5 L 730.5 654.5 Z M 670.5 616.5 L 686.5 616.5 L 686.5 654.5 L 670.5 654.5 Z M 282.5 609.5 L 298.5 609.5 L 298.5 654.5 L 282.5 654.5 Z M 236.5 609.5 L 253.5 609.5 L 253.5 654.5 L 236.5 654.5 Z M 1252.5 609.5 L 1268.5 609.5 L 1268.5 654.5 L 1252.5 654.5 Z M 1206.5 609.5 L 1222.5 609.5 L 1222.5 654.5 L 1206.5 654.5 Z M 572.5 609.5 L 588.5 609.5 L 588.5 654.5 L 572.5 654.5 Z M 1613.5 609.5 L 1630.5 609.5 L 1630.5 654.5 L 1613.5 654.5 Z M 382.5 609.5 L 398.5 609.5 L 398.5 654.5 L 382.5 654.5 Z M 525.5 609.5 L 541.5 609.5 L 541.5 654.5 L 525.5 654.5 Z M 1461.5 609.5 L 1477.5 609.5 L 1477.5 654.5 L 1461.5 654.5 Z M 843.5 609.5 L 859.5 609.5 L 859.5 654.5 L 843.5 654.5 Z M 785.5 609.5 L 801.5 609.5 L 801.5 654.5 L 785.5 654.5 Z M 421.5 609.5 L 437.5 609.5 L 437.5 654.5 L 421.5 654.5 Z M 619.5 609.5 L 635.5 609.5 L 635.5 654.5 L 619.5 654.5 Z M 897.5 586.5 L 913.5 586.5 L 913.5 654.5 L 897.5 654.5 Z M 1360.5 586.5 L 1376.5 586.5 L 1376.5 654.5 L 1360.5 654.5 Z M 942.5 586.5 L 958.5 586.5 L 958.5 654.5 L 942.5 654.5 Z M 1315.5 586.5 L 1331.5 586.5 L 1331.5 654.5 L 1315.5 654.5 Z M 1043.5 586.5 L 1059.5 586.5 L 1059.5 654.5 L 1043.5 654.5 Z M 1664.5 585.5 L 1680.5 585.5 L 1680.5 654.5 L 1664.5 654.5 Z M 1664.5 585.5 "/>
 </clipPath>
-<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1143.5 413.5 L 1159.5 413.5 L 1159.5 458.5 L 1143.5 458.5 Z M 536.5 413.5 L 552.5 413.5 L 552.5 458.5 L 536.5 458.5 Z M 678.5 413.5 L 694.5 413.5 L 694.5 458.5 L 678.5 458.5 Z M 1206.5 413.5 L 1222.5 413.5 L 1222.5 458.5 L 1206.5 458.5 Z M 723.5 413.5 L 739.5 413.5 L 739.5 458.5 L 723.5 458.5 Z M 1264.5 413.5 L 1280.5 413.5 L 1280.5 458.5 L 1264.5 458.5 Z M 787.5 413.5 L 804.5 413.5 L 804.5 458.5 L 787.5 458.5 Z M 844.5 413.5 L 860.5 413.5 L 860.5 458.5 L 844.5 458.5 Z M 581.5 413.5 L 597.5 413.5 L 597.5 458.5 L 581.5 458.5 Z M 626.5 413.5 L 642.5 413.5 L 642.5 458.5 L 626.5 458.5 Z M 1098.5 413.5 L 1114.5 413.5 L 1114.5 458.5 L 1098.5 458.5 Z M 382.5 416.5 L 398.5 416.5 L 398.5 485.5 L 382.5 485.5 Z M 421.5 416.5 L 437.5 416.5 L 437.5 485.5 L 421.5 485.5 Z M 236.5 416.5 L 253.5 416.5 L 253.5 485.5 L 236.5 485.5 Z M 282.5 416.5 L 298.5 416.5 L 298.5 485.5 L 282.5 485.5 Z M 1613.5 422.5 L 1630.5 422.5 L 1630.5 490.5 L 1613.5 490.5 Z M 1354.5 413.5 L 1370.5 413.5 L 1370.5 503.5 L 1354.5 503.5 Z M 947.5 413.5 L 963.5 413.5 L 963.5 503.5 L 947.5 503.5 Z M 1021.5 413.5 L 1037.5 413.5 L 1037.5 503.5 L 1021.5 503.5 Z M 902.5 413.5 L 918.5 413.5 L 918.5 503.5 L 902.5 503.5 Z M 1315.5 413.5 L 1332.5 413.5 L 1332.5 503.5 L 1315.5 503.5 Z M 1461.5 449.5 L 1477.5 449.5 L 1477.5 518.5 L 1461.5 518.5 Z M 1664.5 413.5 L 1680.5 413.5 L 1680.5 520.5 L 1664.5 520.5 Z M 1513.5 413.5 L 1529.5 413.5 L 1529.5 520.5 L 1513.5 520.5 Z M 1513.5 413.5 "/>
 </clipPath>
-<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image460"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 210.5 379.5 L 228.5 379.5 L 228.5 397.5 L 210.5 397.5 Z M 1689.5 379.5 L 1707.5 379.5 L 1707.5 397.5 L 1689.5 397.5 Z M 1640.5 379.5 L 1658.5 379.5 L 1658.5 397.5 L 1640.5 397.5 Z M 1590.5 379.5 L 1609.5 379.5 L 1609.5 397.5 L 1590.5 397.5 Z M 1541.5 379.5 L 1559.5 379.5 L 1559.5 397.5 L 1541.5 397.5 Z M 1492.5 379.5 L 1510.5 379.5 L 1510.5 397.5 L 1492.5 397.5 Z M 1442.5 379.5 L 1461.5 379.5 L 1461.5 397.5 L 1442.5 397.5 Z M 1393.5 379.5 L 1411.5 379.5 L 1411.5 397.5 L 1393.5 397.5 Z M 1344.5 379.5 L 1362.5 379.5 L 1362.5 397.5 L 1344.5 397.5 Z M 1295.5 379.5 L 1313.5 379.5 L 1313.5 397.5 L 1295.5 397.5 Z M 1245.5 379.5 L 1263.5 379.5 L 1263.5 397.5 L 1245.5 397.5 Z M 1196.5 379.5 L 1214.5 379.5 L 1214.5 397.5 L 1196.5 397.5 Z M 1147.5 379.5 L 1165.5 379.5 L 1165.5 397.5 L 1147.5 397.5 Z M 1097.5 379.5 L 1116.5 379.5 L 1116.5 397.5 L 1097.5 397.5 Z M 1048.5 379.5 L 1066.5 379.5 L 1066.5 397.5 L 1048.5 397.5 Z M 999.5 379.5 L 1017.5 379.5 L 1017.5 397.5 L 999.5 397.5 Z M 949.5 379.5 L 968.5 379.5 L 968.5 397.5 L 949.5 397.5 Z M 900.5 379.5 L 918.5 379.5 L 918.5 397.5 L 900.5 397.5 Z M 851.5 379.5 L 869.5 379.5 L 869.5 397.5 L 851.5 397.5 Z M 801.5 379.5 L 820.5 379.5 L 820.5 397.5 L 801.5 397.5 Z M 752.5 379.5 L 770.5 379.5 L 770.5 397.5 L 752.5 397.5 Z M 703.5 379.5 L 721.5 379.5 L 721.5 397.5 L 703.5 397.5 Z M 653.5 379.5 L 672.5 379.5 L 672.5 397.5 L 653.5 397.5 Z M 604.5 379.5 L 622.5 379.5 L 622.5 397.5 L 604.5 397.5 Z M 555.5 379.5 L 573.5 379.5 L 573.5 397.5 L 555.5 397.5 Z M 506.5 379.5 L 524.5 379.5 L 524.5 397.5 L 506.5 397.5 Z M 456.5 379.5 L 474.5 379.5 L 474.5 397.5 L 456.5 397.5 Z M 407.5 379.5 L 425.5 379.5 L 425.5 397.5 L 407.5 397.5 Z M 358.5 379.5 L 376.5 379.5 L 376.5 397.5 L 358.5 397.5 Z M 308.5 379.5 L 327.5 379.5 L 327.5 397.5 L 308.5 397.5 Z M 259.5 379.5 L 277.5 379.5 L 277.5 397.5 L 259.5 397.5 Z M 308.5 470.5 L 327.5 470.5 L 327.5 478.5 L 308.5 478.5 Z M 1097.5 470.5 L 1116.5 470.5 L 1116.5 484.5 L 1097.5 484.5 Z M 1097.5 484.5 L 1116.5 484.5 L 1116.5 488.5 L 1097.5 488.5 Z M 308.5 478.5 L 327.5 478.5 L 327.5 488.5 L 308.5 488.5 Z M 703.5 470.5 L 721.5 470.5 L 721.5 488.5 L 703.5 488.5 Z M 1048.5 506.5 L 1066.5 506.5 L 1066.5 524.5 L 1048.5 524.5 Z M 1393.5 506.5 L 1411.5 506.5 L 1411.5 524.5 L 1393.5 524.5 Z M 506.5 543.5 L 524.5 543.5 L 524.5 561.5 L 506.5 561.5 Z M 1097.5 543.5 L 1116.5 543.5 L 1116.5 561.5 L 1097.5 561.5 Z M 648.5 543.5 L 666.5 543.5 L 666.5 561.5 L 648.5 561.5 Z M 1245.5 579.5 L 1263.5 579.5 L 1263.5 583.5 L 1245.5 583.5 Z M 747.5 579.5 L 765.5 579.5 L 765.5 589.5 L 747.5 589.5 Z M 1245.5 583.5 L 1263.5 583.5 L 1263.5 597.5 L 1245.5 597.5 Z M 259.5 579.5 L 277.5 579.5 L 277.5 597.5 L 259.5 597.5 Z M 747.5 589.5 L 765.5 589.5 L 765.5 597.5 L 747.5 597.5 Z M 851.5 579.5 L 869.5 579.5 L 869.5 597.5 L 851.5 597.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 1689.5 670.5 L 1707.5 670.5 L 1707.5 689.5 L 1689.5 689.5 Z M 1640.5 670.5 L 1658.5 670.5 L 1658.5 689.5 L 1640.5 689.5 Z M 1590.5 670.5 L 1609.5 670.5 L 1609.5 689.5 L 1590.5 689.5 Z M 1541.5 670.5 L 1559.5 670.5 L 1559.5 689.5 L 1541.5 689.5 Z M 1492.5 670.5 L 1510.5 670.5 L 1510.5 689.5 L 1492.5 689.5 Z M 1442.5 670.5 L 1461.5 670.5 L 1461.5 689.5 L 1442.5 689.5 Z M 1393.5 670.5 L 1411.5 670.5 L 1411.5 689.5 L 1393.5 689.5 Z M 1344.5 670.5 L 1362.5 670.5 L 1362.5 689.5 L 1344.5 689.5 Z M 1295.5 670.5 L 1313.5 670.5 L 1313.5 689.5 L 1295.5 689.5 Z M 1245.5 670.5 L 1263.5 670.5 L 1263.5 689.5 L 1245.5 689.5 Z M 1196.5 670.5 L 1214.5 670.5 L 1214.5 689.5 L 1196.5 689.5 Z M 1147.5 670.5 L 1165.5 670.5 L 1165.5 689.5 L 1147.5 689.5 Z M 1097.5 670.5 L 1116.5 670.5 L 1116.5 689.5 L 1097.5 689.5 Z M 1048.5 670.5 L 1066.5 670.5 L 1066.5 689.5 L 1048.5 689.5 Z M 999.5 670.5 L 1017.5 670.5 L 1017.5 689.5 L 999.5 689.5 Z M 949.5 670.5 L 968.5 670.5 L 968.5 689.5 L 949.5 689.5 Z M 900.5 670.5 L 918.5 670.5 L 918.5 689.5 L 900.5 689.5 Z M 851.5 670.5 L 869.5 670.5 L 869.5 689.5 L 851.5 689.5 Z M 801.5 670.5 L 820.5 670.5 L 820.5 689.5 L 801.5 689.5 Z M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 703.5 670.5 L 721.5 670.5 L 721.5 689.5 L 703.5 689.5 Z M 653.5 670.5 L 672.5 670.5 L 672.5 689.5 L 653.5 689.5 Z M 604.5 670.5 L 622.5 670.5 L 622.5 689.5 L 604.5 689.5 Z M 555.5 670.5 L 573.5 670.5 L 573.5 689.5 L 555.5 689.5 Z M 506.5 670.5 L 524.5 670.5 L 524.5 689.5 L 506.5 689.5 Z M 456.5 670.5 L 474.5 670.5 L 474.5 689.5 L 456.5 689.5 Z M 407.5 670.5 L 425.5 670.5 L 425.5 689.5 L 407.5 689.5 Z M 358.5 670.5 L 376.5 670.5 L 376.5 689.5 L 358.5 689.5 Z M 308.5 670.5 L 327.5 670.5 L 327.5 689.5 L 308.5 689.5 Z M 259.5 670.5 L 277.5 670.5 L 277.5 689.5 L 259.5 689.5 Z M 259.5 670.5 "/>
 </clipPath>
-<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image461"/>
+  <use xlink:href="#image488"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface455">
+<g id="surface482">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -241,6 +241,5 @@
 <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 219 396 L 219 403 M 215 400 L 222 400 " 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 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 194 397 L 194 402 M 191 400 L 196 400 " 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 194 395 L 194 404 M 189 400 L 198 400 M 193 401 L 195 401 M 193 399 L 195 399 M 193 399 L 193 401 M 195 399 L 195 401 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.svg b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.svg
index 42a07f9..99177d7 100644
--- a/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.svg
+++ b/cells/sdfbbn/sky130_fd_sc_hd__sdfbbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 377.5 L 1744.5 377.5 L 1744.5 539.5 L 174.5 539.5 Z M 174.5 377.5 "/>
 </clipPath>
-<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image487" 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="#image459"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 208.5 662.5 L 225.5 662.5 L 225.5 679.5 L 208.5 679.5 Z M 208.5 662.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1627.5 581.5 L 1642.5 581.5 L 1642.5 647.5 L 1627.5 647.5 Z M 1043.5 611.5 L 1058.5 611.5 L 1058.5 647.5 L 1043.5 647.5 Z M 1098.5 611.5 L 1113.5 611.5 L 1113.5 647.5 L 1098.5 647.5 Z M 703.5 611.5 L 718.5 611.5 L 718.5 647.5 L 703.5 647.5 Z M 648.5 611.5 L 663.5 611.5 L 663.5 647.5 L 648.5 647.5 Z M 514.5 605.5 L 529.5 605.5 L 529.5 647.5 L 514.5 647.5 Z M 1393.5 605.5 L 1408.5 605.5 L 1408.5 647.5 L 1393.5 647.5 Z M 1579.5 605.5 L 1594.5 605.5 L 1594.5 647.5 L 1579.5 647.5 Z M 407.5 605.5 L 422.5 605.5 L 422.5 647.5 L 407.5 647.5 Z M 1189.5 605.5 L 1204.5 605.5 L 1204.5 647.5 L 1189.5 647.5 Z M 1146.5 605.5 L 1161.5 605.5 L 1161.5 647.5 L 1146.5 647.5 Z M 276.5 605.5 L 291.5 605.5 L 291.5 647.5 L 276.5 647.5 Z M 564.5 605.5 L 579.5 605.5 L 579.5 647.5 L 564.5 647.5 Z M 370.5 605.5 L 386.5 605.5 L 386.5 647.5 L 370.5 647.5 Z M 600.5 605.5 L 615.5 605.5 L 615.5 647.5 L 600.5 647.5 Z M 233.5 605.5 L 248.5 605.5 L 248.5 647.5 L 233.5 647.5 Z M 809.5 605.5 L 824.5 605.5 L 824.5 647.5 L 809.5 647.5 Z M 752.5 605.5 L 767.5 605.5 L 767.5 647.5 L 752.5 647.5 Z M 1291.5 582.5 L 1306.5 582.5 L 1306.5 647.5 L 1291.5 647.5 Z M 995.5 582.5 L 1010.5 582.5 L 1010.5 647.5 L 995.5 647.5 Z M 900.5 582.5 L 915.5 582.5 L 915.5 647.5 L 900.5 647.5 Z M 1248.5 582.5 L 1263.5 582.5 L 1263.5 647.5 L 1248.5 647.5 Z M 858.5 582.5 L 873.5 582.5 L 873.5 647.5 L 858.5 647.5 Z M 1669.5 581.5 L 1685.5 581.5 L 1685.5 647.5 L 1669.5 647.5 Z M 1484.5 581.5 L 1499.5 581.5 L 1499.5 647.5 L 1484.5 647.5 Z M 1442.5 581.5 L 1457.5 581.5 L 1457.5 647.5 L 1442.5 647.5 Z M 1442.5 581.5 "/>
 </clipPath>
-<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image460"/>
+  <use xlink:href="#image488"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1086.5 420.5 L 1101.5 420.5 L 1101.5 462.5 L 1086.5 462.5 Z M 515.5 420.5 L 530.5 420.5 L 530.5 462.5 L 515.5 462.5 Z M 649.5 420.5 L 664.5 420.5 L 664.5 462.5 L 649.5 462.5 Z M 1146.5 420.5 L 1161.5 420.5 L 1161.5 462.5 L 1146.5 462.5 Z M 691.5 420.5 L 706.5 420.5 L 706.5 462.5 L 691.5 462.5 Z M 1200.5 420.5 L 1215.5 420.5 L 1215.5 462.5 L 1200.5 462.5 Z M 752.5 420.5 L 767.5 420.5 L 767.5 462.5 L 752.5 462.5 Z M 805.5 420.5 L 820.5 420.5 L 820.5 462.5 L 805.5 462.5 Z M 558.5 420.5 L 573.5 420.5 L 573.5 462.5 L 558.5 462.5 Z M 600.5 420.5 L 615.5 420.5 L 615.5 462.5 L 600.5 462.5 Z M 1044.5 420.5 L 1059.5 420.5 L 1059.5 462.5 L 1044.5 462.5 Z M 370.5 423.5 L 386.5 423.5 L 386.5 488.5 L 370.5 488.5 Z M 407.5 423.5 L 422.5 423.5 L 422.5 488.5 L 407.5 488.5 Z M 233.5 423.5 L 248.5 423.5 L 248.5 488.5 L 233.5 488.5 Z M 276.5 423.5 L 291.5 423.5 L 291.5 488.5 L 276.5 488.5 Z M 1579.5 428.5 L 1594.5 428.5 L 1594.5 493.5 L 1579.5 493.5 Z M 1285.5 420.5 L 1300.5 420.5 L 1300.5 505.5 L 1285.5 505.5 Z M 860.5 420.5 L 875.5 420.5 L 875.5 505.5 L 860.5 505.5 Z M 1248.5 420.5 L 1263.5 420.5 L 1263.5 505.5 L 1248.5 505.5 Z M 902.5 420.5 L 917.5 420.5 L 917.5 505.5 L 902.5 505.5 Z M 971.5 420.5 L 986.5 420.5 L 986.5 505.5 L 971.5 505.5 Z M 1393.5 454.5 L 1408.5 454.5 L 1408.5 519.5 L 1393.5 519.5 Z M 1627.5 420.5 L 1642.5 420.5 L 1642.5 521.5 L 1627.5 521.5 Z M 1484.5 420.5 L 1499.5 420.5 L 1499.5 521.5 L 1484.5 521.5 Z M 1442.5 420.5 L 1457.5 420.5 L 1457.5 521.5 L 1442.5 521.5 Z M 1669.5 420.5 L 1685.5 420.5 L 1685.5 521.5 L 1669.5 521.5 Z M 1669.5 420.5 "/>
 </clipPath>
-<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image461"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 388.5 L 225.5 388.5 L 225.5 405.5 L 208.5 405.5 Z M 1693.5 388.5 L 1710.5 388.5 L 1710.5 405.5 L 1693.5 405.5 Z M 1646.5 388.5 L 1663.5 388.5 L 1663.5 405.5 L 1646.5 405.5 Z M 1600.5 388.5 L 1617.5 388.5 L 1617.5 405.5 L 1600.5 405.5 Z M 1553.5 388.5 L 1571.5 388.5 L 1571.5 405.5 L 1553.5 405.5 Z M 1507.5 388.5 L 1524.5 388.5 L 1524.5 405.5 L 1507.5 405.5 Z M 1461.5 388.5 L 1478.5 388.5 L 1478.5 405.5 L 1461.5 405.5 Z M 1414.5 388.5 L 1431.5 388.5 L 1431.5 405.5 L 1414.5 405.5 Z M 1368.5 388.5 L 1385.5 388.5 L 1385.5 405.5 L 1368.5 405.5 Z M 1321.5 388.5 L 1339.5 388.5 L 1339.5 405.5 L 1321.5 405.5 Z M 1275.5 388.5 L 1292.5 388.5 L 1292.5 405.5 L 1275.5 405.5 Z M 1229.5 388.5 L 1246.5 388.5 L 1246.5 405.5 L 1229.5 405.5 Z M 1182.5 388.5 L 1199.5 388.5 L 1199.5 405.5 L 1182.5 405.5 Z M 1136.5 388.5 L 1153.5 388.5 L 1153.5 405.5 L 1136.5 405.5 Z M 1090.5 388.5 L 1107.5 388.5 L 1107.5 405.5 L 1090.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 997.5 388.5 L 1014.5 388.5 L 1014.5 405.5 L 997.5 405.5 Z M 950.5 388.5 L 968.5 388.5 L 968.5 405.5 L 950.5 405.5 Z M 904.5 388.5 L 921.5 388.5 L 921.5 405.5 L 904.5 405.5 Z M 858.5 388.5 L 875.5 388.5 L 875.5 405.5 L 858.5 405.5 Z M 811.5 388.5 L 828.5 388.5 L 828.5 405.5 L 811.5 405.5 Z M 765.5 388.5 L 782.5 388.5 L 782.5 405.5 L 765.5 405.5 Z M 718.5 388.5 L 736.5 388.5 L 736.5 405.5 L 718.5 405.5 Z M 672.5 388.5 L 689.5 388.5 L 689.5 405.5 L 672.5 405.5 Z M 626.5 388.5 L 643.5 388.5 L 643.5 405.5 L 626.5 405.5 Z M 579.5 388.5 L 596.5 388.5 L 596.5 405.5 L 579.5 405.5 Z M 533.5 388.5 L 550.5 388.5 L 550.5 405.5 L 533.5 405.5 Z M 486.5 388.5 L 504.5 388.5 L 504.5 405.5 L 486.5 405.5 Z M 440.5 388.5 L 457.5 388.5 L 457.5 405.5 L 440.5 405.5 Z M 394.5 388.5 L 411.5 388.5 L 411.5 405.5 L 394.5 405.5 Z M 347.5 388.5 L 364.5 388.5 L 364.5 405.5 L 347.5 405.5 Z M 301.5 388.5 L 318.5 388.5 L 318.5 405.5 L 301.5 405.5 Z M 255.5 388.5 L 272.5 388.5 L 272.5 405.5 L 255.5 405.5 Z M 301.5 474.5 L 318.5 474.5 L 318.5 482.5 L 301.5 482.5 Z M 1043.5 474.5 L 1060.5 474.5 L 1060.5 487.5 L 1043.5 487.5 Z M 1043.5 487.5 L 1060.5 487.5 L 1060.5 491.5 L 1043.5 491.5 Z M 301.5 482.5 L 318.5 482.5 L 318.5 491.5 L 301.5 491.5 Z M 672.5 474.5 L 689.5 474.5 L 689.5 491.5 L 672.5 491.5 Z M 997.5 508.5 L 1014.5 508.5 L 1014.5 525.5 L 997.5 525.5 Z M 1321.5 508.5 L 1339.5 508.5 L 1339.5 525.5 L 1321.5 525.5 Z M 486.5 542.5 L 504.5 542.5 L 504.5 559.5 L 486.5 559.5 Z M 626.5 542.5 L 643.5 542.5 L 643.5 559.5 L 626.5 559.5 Z M 1043.5 542.5 L 1060.5 542.5 L 1060.5 559.5 L 1043.5 559.5 Z M 811.5 576.5 L 828.5 576.5 L 828.5 580.5 L 811.5 580.5 Z M 1182.5 576.5 L 1199.5 576.5 L 1199.5 580.5 L 1182.5 580.5 Z M 718.5 576.5 L 736.5 576.5 L 736.5 585.5 L 718.5 585.5 Z M 1182.5 580.5 L 1199.5 580.5 L 1199.5 594.5 L 1182.5 594.5 Z M 255.5 576.5 L 272.5 576.5 L 272.5 594.5 L 255.5 594.5 Z M 718.5 585.5 L 736.5 585.5 L 736.5 594.5 L 718.5 594.5 Z M 811.5 580.5 L 828.5 580.5 L 828.5 594.5 L 811.5 594.5 Z M 208.5 662.5 L 225.5 662.5 L 225.5 679.5 L 208.5 679.5 Z M 1693.5 662.5 L 1710.5 662.5 L 1710.5 679.5 L 1693.5 679.5 Z M 1646.5 662.5 L 1663.5 662.5 L 1663.5 679.5 L 1646.5 679.5 Z M 1600.5 662.5 L 1617.5 662.5 L 1617.5 679.5 L 1600.5 679.5 Z M 1553.5 662.5 L 1571.5 662.5 L 1571.5 679.5 L 1553.5 679.5 Z M 1507.5 662.5 L 1524.5 662.5 L 1524.5 679.5 L 1507.5 679.5 Z M 1461.5 662.5 L 1478.5 662.5 L 1478.5 679.5 L 1461.5 679.5 Z M 1414.5 662.5 L 1431.5 662.5 L 1431.5 679.5 L 1414.5 679.5 Z M 1368.5 662.5 L 1385.5 662.5 L 1385.5 679.5 L 1368.5 679.5 Z M 1321.5 662.5 L 1339.5 662.5 L 1339.5 679.5 L 1321.5 679.5 Z M 1275.5 662.5 L 1292.5 662.5 L 1292.5 679.5 L 1275.5 679.5 Z M 1229.5 662.5 L 1246.5 662.5 L 1246.5 679.5 L 1229.5 679.5 Z M 1182.5 662.5 L 1199.5 662.5 L 1199.5 679.5 L 1182.5 679.5 Z M 1136.5 662.5 L 1153.5 662.5 L 1153.5 679.5 L 1136.5 679.5 Z M 1090.5 662.5 L 1107.5 662.5 L 1107.5 679.5 L 1090.5 679.5 Z M 1043.5 662.5 L 1060.5 662.5 L 1060.5 679.5 L 1043.5 679.5 Z M 997.5 662.5 L 1014.5 662.5 L 1014.5 679.5 L 997.5 679.5 Z M 950.5 662.5 L 968.5 662.5 L 968.5 679.5 L 950.5 679.5 Z M 904.5 662.5 L 921.5 662.5 L 921.5 679.5 L 904.5 679.5 Z M 858.5 662.5 L 875.5 662.5 L 875.5 679.5 L 858.5 679.5 Z M 811.5 662.5 L 828.5 662.5 L 828.5 679.5 L 811.5 679.5 Z M 765.5 662.5 L 782.5 662.5 L 782.5 679.5 L 765.5 679.5 Z M 718.5 662.5 L 736.5 662.5 L 736.5 679.5 L 718.5 679.5 Z M 672.5 662.5 L 689.5 662.5 L 689.5 679.5 L 672.5 679.5 Z M 626.5 662.5 L 643.5 662.5 L 643.5 679.5 L 626.5 679.5 Z M 579.5 662.5 L 596.5 662.5 L 596.5 679.5 L 579.5 679.5 Z M 533.5 662.5 L 550.5 662.5 L 550.5 679.5 L 533.5 679.5 Z M 486.5 662.5 L 504.5 662.5 L 504.5 679.5 L 486.5 679.5 Z M 440.5 662.5 L 457.5 662.5 L 457.5 679.5 L 440.5 679.5 Z M 394.5 662.5 L 411.5 662.5 L 411.5 679.5 L 394.5 679.5 Z M 347.5 662.5 L 364.5 662.5 L 364.5 679.5 L 347.5 679.5 Z M 301.5 662.5 L 318.5 662.5 L 318.5 679.5 L 301.5 679.5 Z M 255.5 662.5 L 272.5 662.5 L 272.5 679.5 L 255.5 679.5 Z M 255.5 662.5 "/>
 </clipPath>
-<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image490" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image462"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface456">
+<g id="surface484">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -241,6 +241,5 @@
 <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 217 404 L 217 411 M 213 408 L 220 408 " 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 217 408 L 217 408 M 217 408 L 217 408 M 217 408 L 217 408 M 217 408 L 217 408 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 193 405 L 193 410 M 190 408 L 195 408 " 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 193 403 L 193 412 M 188 408 L 197 408 M 192 409 L 194 409 M 192 407 L 194 407 M 192 407 L 192 409 M 194 407 L 194 409 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.svg b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.svg
index 003f2ad..71a028e 100644
--- a/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.svg
+++ b/cells/sdfbbp/sky130_fd_sc_hd__sdfbbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 367.5 L 1743.5 367.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 367.5 "/>
 </clipPath>
-<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image473" 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="#image446"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 210.5 670.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image446"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1513.5 585.5 L 1529.5 585.5 L 1529.5 654.5 L 1513.5 654.5 Z M 1155.5 616.5 L 1171.5 616.5 L 1171.5 654.5 L 1155.5 654.5 Z M 1097.5 616.5 L 1113.5 616.5 L 1113.5 654.5 L 1097.5 654.5 Z M 736.5 616.5 L 752.5 616.5 L 752.5 654.5 L 736.5 654.5 Z M 677.5 616.5 L 693.5 616.5 L 693.5 654.5 L 677.5 654.5 Z M 282.5 609.5 L 298.5 609.5 L 298.5 654.5 L 282.5 654.5 Z M 236.5 609.5 L 253.5 609.5 L 253.5 654.5 L 236.5 654.5 Z M 1264.5 609.5 L 1280.5 609.5 L 1280.5 654.5 L 1264.5 654.5 Z M 1206.5 609.5 L 1222.5 609.5 L 1222.5 654.5 L 1206.5 654.5 Z M 588.5 609.5 L 604.5 609.5 L 604.5 654.5 L 588.5 654.5 Z M 1613.5 609.5 L 1630.5 609.5 L 1630.5 654.5 L 1613.5 654.5 Z M 382.5 609.5 L 398.5 609.5 L 398.5 654.5 L 382.5 654.5 Z M 534.5 609.5 L 551.5 609.5 L 551.5 654.5 L 534.5 654.5 Z M 1461.5 609.5 L 1477.5 609.5 L 1477.5 654.5 L 1461.5 654.5 Z M 849.5 609.5 L 865.5 609.5 L 865.5 654.5 L 849.5 654.5 Z M 787.5 609.5 L 804.5 609.5 L 804.5 654.5 L 787.5 654.5 Z M 424.5 609.5 L 440.5 609.5 L 440.5 654.5 L 424.5 654.5 Z M 626.5 609.5 L 642.5 609.5 L 642.5 654.5 L 626.5 654.5 Z M 900.5 586.5 L 916.5 586.5 L 916.5 654.5 L 900.5 654.5 Z M 1360.5 586.5 L 1376.5 586.5 L 1376.5 654.5 L 1360.5 654.5 Z M 945.5 586.5 L 961.5 586.5 L 961.5 654.5 L 945.5 654.5 Z M 1315.5 586.5 L 1331.5 586.5 L 1331.5 654.5 L 1315.5 654.5 Z M 1045.5 586.5 L 1061.5 586.5 L 1061.5 654.5 L 1045.5 654.5 Z M 1664.5 585.5 L 1680.5 585.5 L 1680.5 654.5 L 1664.5 654.5 Z M 1664.5 585.5 "/>
 </clipPath>
-<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image474" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image447"/>
+  <use xlink:href="#image474"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1143.5 413.5 L 1159.5 413.5 L 1159.5 458.5 L 1143.5 458.5 Z M 536.5 413.5 L 552.5 413.5 L 552.5 458.5 L 536.5 458.5 Z M 678.5 413.5 L 694.5 413.5 L 694.5 458.5 L 678.5 458.5 Z M 1206.5 413.5 L 1222.5 413.5 L 1222.5 458.5 L 1206.5 458.5 Z M 723.5 413.5 L 739.5 413.5 L 739.5 458.5 L 723.5 458.5 Z M 1264.5 413.5 L 1280.5 413.5 L 1280.5 458.5 L 1264.5 458.5 Z M 787.5 413.5 L 804.5 413.5 L 804.5 458.5 L 787.5 458.5 Z M 844.5 413.5 L 860.5 413.5 L 860.5 458.5 L 844.5 458.5 Z M 581.5 413.5 L 597.5 413.5 L 597.5 458.5 L 581.5 458.5 Z M 626.5 413.5 L 642.5 413.5 L 642.5 458.5 L 626.5 458.5 Z M 1098.5 413.5 L 1114.5 413.5 L 1114.5 458.5 L 1098.5 458.5 Z M 382.5 416.5 L 398.5 416.5 L 398.5 485.5 L 382.5 485.5 Z M 421.5 416.5 L 437.5 416.5 L 437.5 485.5 L 421.5 485.5 Z M 236.5 416.5 L 253.5 416.5 L 253.5 485.5 L 236.5 485.5 Z M 282.5 416.5 L 298.5 416.5 L 298.5 485.5 L 282.5 485.5 Z M 1613.5 422.5 L 1630.5 422.5 L 1630.5 490.5 L 1613.5 490.5 Z M 1354.5 413.5 L 1370.5 413.5 L 1370.5 503.5 L 1354.5 503.5 Z M 947.5 413.5 L 963.5 413.5 L 963.5 503.5 L 947.5 503.5 Z M 1021.5 413.5 L 1037.5 413.5 L 1037.5 503.5 L 1021.5 503.5 Z M 902.5 413.5 L 918.5 413.5 L 918.5 503.5 L 902.5 503.5 Z M 1315.5 413.5 L 1332.5 413.5 L 1332.5 503.5 L 1315.5 503.5 Z M 1461.5 449.5 L 1477.5 449.5 L 1477.5 518.5 L 1461.5 518.5 Z M 1664.5 413.5 L 1680.5 413.5 L 1680.5 520.5 L 1664.5 520.5 Z M 1513.5 413.5 L 1529.5 413.5 L 1529.5 520.5 L 1513.5 520.5 Z M 1513.5 413.5 "/>
 </clipPath>
-<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image475" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image448"/>
+  <use xlink:href="#image475"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 210.5 379.5 L 228.5 379.5 L 228.5 397.5 L 210.5 397.5 Z M 1689.5 379.5 L 1707.5 379.5 L 1707.5 397.5 L 1689.5 397.5 Z M 1640.5 379.5 L 1658.5 379.5 L 1658.5 397.5 L 1640.5 397.5 Z M 1590.5 379.5 L 1609.5 379.5 L 1609.5 397.5 L 1590.5 397.5 Z M 1541.5 379.5 L 1559.5 379.5 L 1559.5 397.5 L 1541.5 397.5 Z M 1492.5 379.5 L 1510.5 379.5 L 1510.5 397.5 L 1492.5 397.5 Z M 1442.5 379.5 L 1461.5 379.5 L 1461.5 397.5 L 1442.5 397.5 Z M 1393.5 379.5 L 1411.5 379.5 L 1411.5 397.5 L 1393.5 397.5 Z M 1344.5 379.5 L 1362.5 379.5 L 1362.5 397.5 L 1344.5 397.5 Z M 1295.5 379.5 L 1313.5 379.5 L 1313.5 397.5 L 1295.5 397.5 Z M 1245.5 379.5 L 1263.5 379.5 L 1263.5 397.5 L 1245.5 397.5 Z M 1196.5 379.5 L 1214.5 379.5 L 1214.5 397.5 L 1196.5 397.5 Z M 1147.5 379.5 L 1165.5 379.5 L 1165.5 397.5 L 1147.5 397.5 Z M 1097.5 379.5 L 1116.5 379.5 L 1116.5 397.5 L 1097.5 397.5 Z M 1048.5 379.5 L 1066.5 379.5 L 1066.5 397.5 L 1048.5 397.5 Z M 999.5 379.5 L 1017.5 379.5 L 1017.5 397.5 L 999.5 397.5 Z M 949.5 379.5 L 968.5 379.5 L 968.5 397.5 L 949.5 397.5 Z M 900.5 379.5 L 918.5 379.5 L 918.5 397.5 L 900.5 397.5 Z M 851.5 379.5 L 869.5 379.5 L 869.5 397.5 L 851.5 397.5 Z M 801.5 379.5 L 820.5 379.5 L 820.5 397.5 L 801.5 397.5 Z M 752.5 379.5 L 770.5 379.5 L 770.5 397.5 L 752.5 397.5 Z M 703.5 379.5 L 721.5 379.5 L 721.5 397.5 L 703.5 397.5 Z M 653.5 379.5 L 672.5 379.5 L 672.5 397.5 L 653.5 397.5 Z M 604.5 379.5 L 622.5 379.5 L 622.5 397.5 L 604.5 397.5 Z M 555.5 379.5 L 573.5 379.5 L 573.5 397.5 L 555.5 397.5 Z M 506.5 379.5 L 524.5 379.5 L 524.5 397.5 L 506.5 397.5 Z M 456.5 379.5 L 474.5 379.5 L 474.5 397.5 L 456.5 397.5 Z M 407.5 379.5 L 425.5 379.5 L 425.5 397.5 L 407.5 397.5 Z M 358.5 379.5 L 376.5 379.5 L 376.5 397.5 L 358.5 397.5 Z M 308.5 379.5 L 327.5 379.5 L 327.5 397.5 L 308.5 397.5 Z M 259.5 379.5 L 277.5 379.5 L 277.5 397.5 L 259.5 397.5 Z M 1097.5 470.5 L 1116.5 470.5 L 1116.5 484.5 L 1097.5 484.5 Z M 1097.5 484.5 L 1116.5 484.5 L 1116.5 488.5 L 1097.5 488.5 Z M 259.5 470.5 L 277.5 470.5 L 277.5 488.5 L 259.5 488.5 Z M 703.5 470.5 L 721.5 470.5 L 721.5 488.5 L 703.5 488.5 Z M 1048.5 506.5 L 1066.5 506.5 L 1066.5 524.5 L 1048.5 524.5 Z M 1393.5 506.5 L 1411.5 506.5 L 1411.5 524.5 L 1393.5 524.5 Z M 1097.5 543.5 L 1116.5 543.5 L 1116.5 561.5 L 1097.5 561.5 Z M 653.5 543.5 L 672.5 543.5 L 672.5 561.5 L 653.5 561.5 Z M 506.5 543.5 L 524.5 543.5 L 524.5 561.5 L 506.5 561.5 Z M 851.5 579.5 L 869.5 579.5 L 869.5 583.5 L 851.5 583.5 Z M 1245.5 579.5 L 1263.5 579.5 L 1263.5 583.5 L 1245.5 583.5 Z M 752.5 579.5 L 770.5 579.5 L 770.5 589.5 L 752.5 589.5 Z M 1245.5 583.5 L 1263.5 583.5 L 1263.5 597.5 L 1245.5 597.5 Z M 308.5 579.5 L 327.5 579.5 L 327.5 597.5 L 308.5 597.5 Z M 752.5 589.5 L 770.5 589.5 L 770.5 597.5 L 752.5 597.5 Z M 851.5 583.5 L 869.5 583.5 L 869.5 597.5 L 851.5 597.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 1689.5 670.5 L 1707.5 670.5 L 1707.5 689.5 L 1689.5 689.5 Z M 1640.5 670.5 L 1658.5 670.5 L 1658.5 689.5 L 1640.5 689.5 Z M 1590.5 670.5 L 1609.5 670.5 L 1609.5 689.5 L 1590.5 689.5 Z M 1541.5 670.5 L 1559.5 670.5 L 1559.5 689.5 L 1541.5 689.5 Z M 1492.5 670.5 L 1510.5 670.5 L 1510.5 689.5 L 1492.5 689.5 Z M 1442.5 670.5 L 1461.5 670.5 L 1461.5 689.5 L 1442.5 689.5 Z M 1393.5 670.5 L 1411.5 670.5 L 1411.5 689.5 L 1393.5 689.5 Z M 1344.5 670.5 L 1362.5 670.5 L 1362.5 689.5 L 1344.5 689.5 Z M 1295.5 670.5 L 1313.5 670.5 L 1313.5 689.5 L 1295.5 689.5 Z M 1245.5 670.5 L 1263.5 670.5 L 1263.5 689.5 L 1245.5 689.5 Z M 1196.5 670.5 L 1214.5 670.5 L 1214.5 689.5 L 1196.5 689.5 Z M 1147.5 670.5 L 1165.5 670.5 L 1165.5 689.5 L 1147.5 689.5 Z M 1097.5 670.5 L 1116.5 670.5 L 1116.5 689.5 L 1097.5 689.5 Z M 1048.5 670.5 L 1066.5 670.5 L 1066.5 689.5 L 1048.5 689.5 Z M 999.5 670.5 L 1017.5 670.5 L 1017.5 689.5 L 999.5 689.5 Z M 949.5 670.5 L 968.5 670.5 L 968.5 689.5 L 949.5 689.5 Z M 900.5 670.5 L 918.5 670.5 L 918.5 689.5 L 900.5 689.5 Z M 851.5 670.5 L 869.5 670.5 L 869.5 689.5 L 851.5 689.5 Z M 801.5 670.5 L 820.5 670.5 L 820.5 689.5 L 801.5 689.5 Z M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 703.5 670.5 L 721.5 670.5 L 721.5 689.5 L 703.5 689.5 Z M 653.5 670.5 L 672.5 670.5 L 672.5 689.5 L 653.5 689.5 Z M 604.5 670.5 L 622.5 670.5 L 622.5 689.5 L 604.5 689.5 Z M 555.5 670.5 L 573.5 670.5 L 573.5 689.5 L 555.5 689.5 Z M 506.5 670.5 L 524.5 670.5 L 524.5 689.5 L 506.5 689.5 Z M 456.5 670.5 L 474.5 670.5 L 474.5 689.5 L 456.5 689.5 Z M 407.5 670.5 L 425.5 670.5 L 425.5 689.5 L 407.5 689.5 Z M 358.5 670.5 L 376.5 670.5 L 376.5 689.5 L 358.5 689.5 Z M 308.5 670.5 L 327.5 670.5 L 327.5 689.5 L 308.5 689.5 Z M 259.5 670.5 L 277.5 670.5 L 277.5 689.5 L 259.5 689.5 Z M 259.5 670.5 "/>
 </clipPath>
-<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image476" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image449"/>
+  <use xlink:href="#image476"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface443">
+<g id="surface470">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -237,6 +237,5 @@
 <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 219 396 L 219 403 M 215 400 L 222 400 " 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 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 194 397 L 194 402 M 191 400 L 196 400 " 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 194 395 L 194 404 M 189 400 L 198 400 M 193 401 L 195 401 M 193 399 L 195 399 M 193 399 L 193 401 M 195 399 L 195 401 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.svg b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.svg
index 7639c2b..63f3898 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.svg
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 350.5 L 1743.5 350.5 L 1743.5 526.5 L 174.5 526.5 Z M 718.5 526.5 L 1743.5 526.5 L 1743.5 540.5 L 718.5 540.5 Z M 174.5 526.5 L 430.5 526.5 L 430.5 540.5 L 174.5 540.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image412" 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="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 222.5 693.5 L 224.5 693.5 L 224.5 696.5 L 222.5 696.5 Z M 222.5 693.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 558.5 575.5 L 576.5 575.5 L 576.5 624.5 L 558.5 624.5 Z M 516.5 575.5 L 533.5 575.5 L 533.5 624.5 L 516.5 624.5 Z M 705.5 606.5 L 726.5 606.5 L 726.5 656.5 L 705.5 656.5 Z M 404.5 606.5 L 422.5 606.5 L 422.5 656.5 L 404.5 656.5 Z M 621.5 606.5 L 680.5 606.5 L 680.5 656.5 L 621.5 656.5 Z M 1330.5 617.5 L 1348.5 617.5 L 1348.5 667.5 L 1330.5 667.5 Z M 1242.5 617.5 L 1260.5 617.5 L 1260.5 667.5 L 1242.5 667.5 Z M 944.5 617.5 L 962.5 617.5 L 962.5 667.5 L 944.5 667.5 Z M 1377.5 617.5 L 1395.5 617.5 L 1395.5 667.5 L 1377.5 667.5 Z M 987.5 617.5 L 1004.5 617.5 L 1004.5 667.5 L 987.5 667.5 Z M 822.5 624.5 L 840.5 624.5 L 840.5 667.5 L 822.5 667.5 Z M 243.5 590.5 L 261.5 590.5 L 261.5 667.5 L 243.5 667.5 Z M 293.5 590.5 L 311.5 590.5 L 311.5 667.5 L 293.5 667.5 Z M 1603.5 605.5 L 1620.5 605.5 L 1620.5 667.5 L 1603.5 667.5 Z M 1655.5 605.5 L 1672.5 605.5 L 1672.5 667.5 L 1655.5 667.5 Z M 1065.5 591.5 L 1082.5 591.5 L 1082.5 667.5 L 1065.5 667.5 Z M 1185.5 624.5 L 1203.5 624.5 L 1203.5 667.5 L 1185.5 667.5 Z M 881.5 624.5 L 899.5 624.5 L 899.5 667.5 L 881.5 667.5 Z M 1491.5 590.5 L 1509.5 590.5 L 1509.5 667.5 L 1491.5 667.5 Z M 1121.5 624.5 L 1139.5 624.5 L 1139.5 667.5 L 1121.5 667.5 Z M 1121.5 624.5 "/>
 </clipPath>
-<image id="image385" 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="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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1380.5 401.5 L 1398.5 401.5 L 1398.5 450.5 L 1380.5 450.5 Z M 1330.5 401.5 L 1348.5 401.5 L 1348.5 450.5 L 1330.5 450.5 Z M 1168.5 401.5 L 1186.5 401.5 L 1186.5 450.5 L 1168.5 450.5 Z M 1001.5 401.5 L 1019.5 401.5 L 1019.5 450.5 L 1001.5 450.5 Z M 933.5 401.5 L 951.5 401.5 L 951.5 450.5 L 933.5 450.5 Z M 1268.5 401.5 L 1285.5 401.5 L 1285.5 450.5 L 1268.5 450.5 Z M 884.5 401.5 L 901.5 401.5 L 901.5 450.5 L 884.5 450.5 Z M 817.5 401.5 L 835.5 401.5 L 835.5 450.5 L 817.5 450.5 Z M 1219.5 401.5 L 1237.5 401.5 L 1237.5 450.5 L 1219.5 450.5 Z M 546.5 401.5 L 564.5 401.5 L 564.5 465.5 L 546.5 465.5 Z M 497.5 401.5 L 515.5 401.5 L 515.5 465.5 L 497.5 465.5 Z M 448.5 401.5 L 465.5 401.5 L 465.5 465.5 L 448.5 465.5 Z M 640.5 401.5 L 658.5 401.5 L 658.5 465.5 L 640.5 465.5 Z M 691.5 401.5 L 709.5 401.5 L 709.5 465.5 L 691.5 465.5 Z M 1603.5 401.5 L 1620.5 401.5 L 1620.5 494.5 L 1603.5 494.5 Z M 1655.5 401.5 L 1672.5 401.5 L 1672.5 494.5 L 1655.5 494.5 Z M 1112.5 401.5 L 1130.5 401.5 L 1130.5 500.5 L 1112.5 500.5 Z M 243.5 401.5 L 261.5 401.5 L 261.5 519.5 L 243.5 519.5 Z M 295.5 401.5 L 313.5 401.5 L 313.5 519.5 L 295.5 519.5 Z M 1491.5 401.5 L 1509.5 401.5 L 1509.5 519.5 L 1491.5 519.5 Z M 1491.5 401.5 "/>
 </clipPath>
-<image id="image386" 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="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 214.5 363.5 L 234.5 363.5 L 234.5 383.5 L 214.5 383.5 Z M 1684.5 363.5 L 1704.5 363.5 L 1704.5 383.5 L 1684.5 383.5 Z M 1629.5 363.5 L 1649.5 363.5 L 1649.5 383.5 L 1629.5 383.5 Z M 1575.5 363.5 L 1595.5 363.5 L 1595.5 383.5 L 1575.5 383.5 Z M 1520.5 363.5 L 1541.5 363.5 L 1541.5 383.5 L 1520.5 383.5 Z M 1466.5 363.5 L 1486.5 363.5 L 1486.5 383.5 L 1466.5 383.5 Z M 1412.5 363.5 L 1432.5 363.5 L 1432.5 383.5 L 1412.5 383.5 Z M 1357.5 363.5 L 1377.5 363.5 L 1377.5 383.5 L 1357.5 383.5 Z M 1303.5 363.5 L 1323.5 363.5 L 1323.5 383.5 L 1303.5 383.5 Z M 1248.5 363.5 L 1268.5 363.5 L 1268.5 383.5 L 1248.5 383.5 Z M 1194.5 363.5 L 1214.5 363.5 L 1214.5 383.5 L 1194.5 383.5 Z M 1139.5 363.5 L 1159.5 363.5 L 1159.5 383.5 L 1139.5 383.5 Z M 1085.5 363.5 L 1105.5 363.5 L 1105.5 383.5 L 1085.5 383.5 Z M 1030.5 363.5 L 1051.5 363.5 L 1051.5 383.5 L 1030.5 383.5 Z M 976.5 363.5 L 996.5 363.5 L 996.5 383.5 L 976.5 383.5 Z M 922.5 363.5 L 942.5 363.5 L 942.5 383.5 L 922.5 383.5 Z M 867.5 363.5 L 887.5 363.5 L 887.5 383.5 L 867.5 383.5 Z M 813.5 363.5 L 833.5 363.5 L 833.5 383.5 L 813.5 383.5 Z M 758.5 363.5 L 778.5 363.5 L 778.5 383.5 L 758.5 383.5 Z M 704.5 363.5 L 724.5 363.5 L 724.5 383.5 L 704.5 383.5 Z M 649.5 363.5 L 669.5 363.5 L 669.5 383.5 L 649.5 383.5 Z M 595.5 363.5 L 615.5 363.5 L 615.5 383.5 L 595.5 383.5 Z M 540.5 363.5 L 561.5 363.5 L 561.5 383.5 L 540.5 383.5 Z M 486.5 363.5 L 506.5 363.5 L 506.5 383.5 L 486.5 383.5 Z M 432.5 363.5 L 452.5 363.5 L 452.5 383.5 L 432.5 383.5 Z M 377.5 363.5 L 397.5 363.5 L 397.5 383.5 L 377.5 383.5 Z M 323.5 363.5 L 343.5 363.5 L 343.5 383.5 L 323.5 383.5 Z M 268.5 363.5 L 288.5 363.5 L 288.5 383.5 L 268.5 383.5 Z M 319.5 463.5 L 339.5 463.5 L 339.5 473.5 L 319.5 473.5 Z M 827.5 463.5 L 847.5 463.5 L 847.5 479.5 L 827.5 479.5 Z M 827.5 479.5 L 847.5 479.5 L 847.5 483.5 L 827.5 483.5 Z M 319.5 473.5 L 339.5 473.5 L 339.5 483.5 L 319.5 483.5 Z M 1196.5 463.5 L 1216.5 463.5 L 1216.5 483.5 L 1196.5 483.5 Z M 292.5 544.5 L 312.5 544.5 L 312.5 547.5 L 292.5 547.5 Z M 1343.5 544.5 L 1364.5 544.5 L 1364.5 549.5 L 1343.5 549.5 Z M 1191.5 544.5 L 1211.5 544.5 L 1211.5 553.5 L 1191.5 553.5 Z M 777.5 544.5 L 797.5 544.5 L 797.5 559.5 L 777.5 559.5 Z M 777.5 559.5 L 797.5 559.5 L 797.5 564.5 L 777.5 564.5 Z M 1343.5 549.5 L 1364.5 549.5 L 1364.5 564.5 L 1343.5 564.5 Z M 292.5 547.5 L 312.5 547.5 L 312.5 564.5 L 292.5 564.5 Z M 1191.5 553.5 L 1211.5 553.5 L 1211.5 564.5 L 1191.5 564.5 Z M 1009.5 584.5 L 1029.5 584.5 L 1029.5 591.5 L 1009.5 591.5 Z M 967.5 584.5 L 987.5 584.5 L 987.5 604.5 L 967.5 604.5 Z M 1009.5 591.5 L 1029.5 591.5 L 1029.5 604.5 L 1009.5 604.5 Z M 1374.5 584.5 L 1394.5 584.5 L 1394.5 604.5 L 1374.5 604.5 Z M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 1684.5 685.5 L 1704.5 685.5 L 1704.5 705.5 L 1684.5 705.5 Z M 1629.5 685.5 L 1649.5 685.5 L 1649.5 705.5 L 1629.5 705.5 Z M 1575.5 685.5 L 1595.5 685.5 L 1595.5 705.5 L 1575.5 705.5 Z M 1520.5 685.5 L 1541.5 685.5 L 1541.5 705.5 L 1520.5 705.5 Z M 1466.5 685.5 L 1486.5 685.5 L 1486.5 705.5 L 1466.5 705.5 Z M 1412.5 685.5 L 1432.5 685.5 L 1432.5 705.5 L 1412.5 705.5 Z M 1357.5 685.5 L 1377.5 685.5 L 1377.5 705.5 L 1357.5 705.5 Z M 1303.5 685.5 L 1323.5 685.5 L 1323.5 705.5 L 1303.5 705.5 Z M 1248.5 685.5 L 1268.5 685.5 L 1268.5 705.5 L 1248.5 705.5 Z M 1194.5 685.5 L 1214.5 685.5 L 1214.5 705.5 L 1194.5 705.5 Z M 1139.5 685.5 L 1159.5 685.5 L 1159.5 705.5 L 1139.5 705.5 Z M 1085.5 685.5 L 1105.5 685.5 L 1105.5 705.5 L 1085.5 705.5 Z M 1030.5 685.5 L 1051.5 685.5 L 1051.5 705.5 L 1030.5 705.5 Z M 976.5 685.5 L 996.5 685.5 L 996.5 705.5 L 976.5 705.5 Z M 922.5 685.5 L 942.5 685.5 L 942.5 705.5 L 922.5 705.5 Z M 867.5 685.5 L 887.5 685.5 L 887.5 705.5 L 867.5 705.5 Z M 813.5 685.5 L 833.5 685.5 L 833.5 705.5 L 813.5 705.5 Z M 758.5 685.5 L 778.5 685.5 L 778.5 705.5 L 758.5 705.5 Z M 704.5 685.5 L 724.5 685.5 L 724.5 705.5 L 704.5 705.5 Z M 649.5 685.5 L 669.5 685.5 L 669.5 705.5 L 649.5 705.5 Z M 595.5 685.5 L 615.5 685.5 L 615.5 705.5 L 595.5 705.5 Z M 540.5 685.5 L 561.5 685.5 L 561.5 705.5 L 540.5 705.5 Z M 486.5 685.5 L 506.5 685.5 L 506.5 705.5 L 486.5 705.5 Z M 432.5 685.5 L 452.5 685.5 L 452.5 705.5 L 432.5 705.5 Z M 377.5 685.5 L 397.5 685.5 L 397.5 705.5 L 377.5 705.5 Z M 323.5 685.5 L 343.5 685.5 L 343.5 705.5 L 323.5 705.5 Z M 268.5 685.5 L 288.5 685.5 L 288.5 705.5 L 268.5 705.5 Z M 268.5 685.5 "/>
 </clipPath>
-<image id="image387" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface381">
+<g id="surface409">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -201,6 +201,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 1544.3125 448.140625 L 1542.402344 450.5 L 1538.132812 446.960938 L 1536.910156 447.613281 L 1535.691406 448.101562 L 1534.429688 448.507812 L 1533.085938 448.792969 L 1531.746094 448.953125 L 1530.363281 449.035156 L 1528.492188 448.914062 L 1526.742188 448.628906 L 1525.117188 448.140625 L 1523.570312 447.488281 L 1522.105469 446.636719 L 1520.804688 445.539062 L 1519.625 444.359375 L 1518.609375 443.015625 L 1517.792969 441.550781 L 1517.101562 439.964844 L 1516.574219 438.257812 L 1516.25 436.386719 L 1516.167969 435.9375 L 1516.125 435.449219 L 1516.085938 435.003906 L 1516.046875 434.515625 L 1516.046875 433.5 L 1516.125 431.464844 L 1516.410156 429.511719 L 1516.859375 427.722656 L 1517.511719 426.015625 L 1518.324219 424.429688 L 1519.378906 422.964844 L 1520.4375 421.785156 L 1521.660156 420.726562 L 1523 419.832031 L 1524.425781 419.140625 L 1525.96875 418.570312 L 1527.679688 418.164062 L 1528.085938 418.125 L 1528.53125 418.082031 L 1528.980469 418.042969 L 1529.425781 418.003906 L 1529.875 418.003906 L 1530.363281 417.960938 L 1532.191406 418.082031 L 1533.941406 418.367188 L 1535.570312 418.855469 L 1537.113281 419.507812 L 1538.578125 420.359375 L 1539.921875 421.417969 L 1541.058594 422.640625 L 1542.078125 423.941406 L 1542.890625 425.363281 L 1543.582031 426.949219 L 1544.109375 428.660156 L 1544.476562 430.449219 L 1544.515625 430.976562 L 1544.558594 431.464844 L 1544.597656 431.953125 L 1544.640625 432.441406 L 1544.640625 432.929688 L 1544.679688 433.417969 L 1544.558594 435.695312 L 1544.191406 437.851562 L 1543.621094 439.84375 L 1542.808594 441.714844 L 1541.75 443.421875 L 1540.488281 445.007812 Z M 1534.0625 439.761719 L 1537.683594 442.730469 L 1538.660156 441.511719 L 1539.472656 440.128906 L 1540.082031 438.625 L 1540.53125 437.039062 L 1540.773438 435.328125 L 1540.898438 433.457031 L 1540.816406 431.75 L 1540.570312 430.121094 L 1540.164062 428.617188 L 1539.636719 427.234375 L 1538.945312 425.933594 L 1538.089844 424.753906 L 1537.113281 423.777344 L 1536.097656 422.964844 L 1534.957031 422.3125 L 1533.738281 421.824219 L 1532.394531 421.5 L 1531.011719 421.296875 L 1530.363281 421.296875 L 1528.898438 421.417969 L 1527.515625 421.664062 L 1526.214844 422.070312 L 1525.035156 422.679688 L 1523.9375 423.453125 L 1522.960938 424.386719 L 1522.023438 425.484375 L 1521.292969 426.707031 L 1520.683594 428.046875 L 1520.234375 429.511719 L 1519.949219 431.097656 L 1519.828125 432.808594 L 1519.828125 433.5 L 1519.867188 435.289062 L 1520.113281 436.914062 L 1520.519531 438.421875 L 1521.046875 439.84375 L 1521.78125 441.144531 L 1522.675781 442.285156 L 1523.609375 443.300781 L 1524.667969 444.113281 L 1525.808594 444.765625 L 1527.027344 445.210938 L 1528.371094 445.539062 L 1529.792969 445.660156 L 1529.875 445.699219 L 1531.054688 445.699219 L 1531.828125 445.621094 L 1532.597656 445.457031 L 1533.332031 445.292969 L 1534.0625 445.050781 L 1534.835938 444.722656 L 1534.878906 444.722656 L 1534.957031 444.683594 L 1535 444.644531 L 1535.082031 444.644531 L 1535.121094 444.601562 L 1535.203125 444.5625 L 1532.191406 442.039062 Z M 1534.0625 439.761719 "/>
 <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 1519 656 L 1539 656 M 1519 636 L 1539 636 M 1519 636 L 1519 656 M 1539 636 L 1539 656 " 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 1519 656 L 1539 656 M 1519 636 L 1539 636 M 1539 656 L 1539 636 M 1519 656 L 1519 636 " 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 197 379 L 197 388 M 192 384 L 201 384 M 196 385 L 198 385 M 196 383 L 198 383 M 196 383 L 196 385 M 198 383 L 198 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.svg b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.svg
index b0c5355..aae9f30 100644
--- a/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.svg
+++ b/cells/sdfrbp/sky130_fd_sc_hd__sdfrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 356.5 L 1744.5 356.5 L 1744.5 526.5 L 174.5 526.5 Z M 700.5 526.5 L 1744.5 526.5 L 1744.5 540.5 L 700.5 540.5 Z M 174.5 526.5 L 421.5 526.5 L 421.5 540.5 L 174.5 540.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image387" 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="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 221.5 688.5 L 223.5 688.5 L 223.5 690.5 L 221.5 690.5 Z M 221.5 688.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 546.5 573.5 L 563.5 573.5 L 563.5 621.5 L 546.5 621.5 Z M 504.5 573.5 L 522.5 573.5 L 522.5 621.5 L 504.5 621.5 Z M 687.5 603.5 L 708.5 603.5 L 708.5 652.5 L 687.5 652.5 Z M 397.5 603.5 L 414.5 603.5 L 414.5 652.5 L 397.5 652.5 Z M 606.5 603.5 L 663.5 603.5 L 663.5 652.5 L 606.5 652.5 Z M 1447.5 614.5 L 1464.5 614.5 L 1464.5 662.5 L 1447.5 662.5 Z M 1337.5 614.5 L 1354.5 614.5 L 1354.5 662.5 L 1337.5 662.5 Z M 1292.5 614.5 L 1309.5 614.5 L 1309.5 662.5 L 1292.5 662.5 Z M 1207.5 614.5 L 1224.5 614.5 L 1224.5 662.5 L 1207.5 662.5 Z M 918.5 614.5 L 936.5 614.5 L 936.5 662.5 L 918.5 662.5 Z M 960.5 614.5 L 977.5 614.5 L 977.5 662.5 L 960.5 662.5 Z M 1654.5 588.5 L 1671.5 588.5 L 1671.5 662.5 L 1654.5 662.5 Z M 1152.5 621.5 L 1169.5 621.5 L 1169.5 662.5 L 1152.5 662.5 Z M 241.5 588.5 L 258.5 588.5 L 258.5 662.5 L 241.5 662.5 Z M 1035.5 589.5 L 1052.5 589.5 L 1052.5 662.5 L 1035.5 662.5 Z M 1554.5 588.5 L 1572.5 588.5 L 1572.5 662.5 L 1554.5 662.5 Z M 1606.5 588.5 L 1623.5 588.5 L 1623.5 662.5 L 1606.5 662.5 Z M 1502.5 588.5 L 1519.5 588.5 L 1519.5 662.5 L 1502.5 662.5 Z M 858.5 621.5 L 875.5 621.5 L 875.5 662.5 L 858.5 662.5 Z M 289.5 588.5 L 306.5 588.5 L 306.5 662.5 L 289.5 662.5 Z M 1089.5 621.5 L 1107.5 621.5 L 1107.5 662.5 L 1089.5 662.5 Z M 801.5 621.5 L 818.5 621.5 L 818.5 662.5 L 801.5 662.5 Z M 801.5 621.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1340.5 405.5 L 1357.5 405.5 L 1357.5 453.5 L 1340.5 453.5 Z M 1184.5 405.5 L 1202.5 405.5 L 1202.5 453.5 L 1184.5 453.5 Z M 1135.5 405.5 L 1152.5 405.5 L 1152.5 453.5 L 1135.5 453.5 Z M 973.5 405.5 L 991.5 405.5 L 991.5 453.5 L 973.5 453.5 Z M 1292.5 405.5 L 1309.5 405.5 L 1309.5 453.5 L 1292.5 453.5 Z M 908.5 405.5 L 925.5 405.5 L 925.5 453.5 L 908.5 453.5 Z M 860.5 405.5 L 877.5 405.5 L 877.5 453.5 L 860.5 453.5 Z M 1231.5 405.5 L 1248.5 405.5 L 1248.5 453.5 L 1231.5 453.5 Z M 796.5 405.5 L 813.5 405.5 L 813.5 453.5 L 796.5 453.5 Z M 625.5 405.5 L 642.5 405.5 L 642.5 467.5 L 625.5 467.5 Z M 534.5 405.5 L 551.5 405.5 L 551.5 467.5 L 534.5 467.5 Z M 487.5 405.5 L 504.5 405.5 L 504.5 467.5 L 487.5 467.5 Z M 439.5 405.5 L 456.5 405.5 L 456.5 467.5 L 439.5 467.5 Z M 674.5 405.5 L 691.5 405.5 L 691.5 467.5 L 674.5 467.5 Z M 1448.5 410.5 L 1465.5 410.5 L 1465.5 483.5 L 1448.5 483.5 Z M 1081.5 405.5 L 1098.5 405.5 L 1098.5 501.5 L 1081.5 501.5 Z M 241.5 405.5 L 258.5 405.5 L 258.5 519.5 L 241.5 519.5 Z M 1502.5 405.5 L 1519.5 405.5 L 1519.5 519.5 L 1502.5 519.5 Z M 1554.5 405.5 L 1572.5 405.5 L 1572.5 519.5 L 1554.5 519.5 Z M 291.5 405.5 L 308.5 405.5 L 308.5 519.5 L 291.5 519.5 Z M 1606.5 405.5 L 1623.5 405.5 L 1623.5 519.5 L 1606.5 519.5 Z M 1654.5 405.5 L 1671.5 405.5 L 1671.5 519.5 L 1654.5 519.5 Z M 1654.5 405.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 1686.5 368.5 L 1705.5 368.5 L 1705.5 388.5 L 1686.5 388.5 Z M 1633.5 368.5 L 1653.5 368.5 L 1653.5 388.5 L 1633.5 388.5 Z M 1581.5 368.5 L 1600.5 368.5 L 1600.5 388.5 L 1581.5 388.5 Z M 1528.5 368.5 L 1548.5 368.5 L 1548.5 388.5 L 1528.5 388.5 Z M 1476.5 368.5 L 1495.5 368.5 L 1495.5 388.5 L 1476.5 388.5 Z M 1423.5 368.5 L 1442.5 368.5 L 1442.5 388.5 L 1423.5 388.5 Z M 1370.5 368.5 L 1390.5 368.5 L 1390.5 388.5 L 1370.5 388.5 Z M 1318.5 368.5 L 1337.5 368.5 L 1337.5 388.5 L 1318.5 388.5 Z M 1265.5 368.5 L 1285.5 368.5 L 1285.5 388.5 L 1265.5 388.5 Z M 1212.5 368.5 L 1232.5 368.5 L 1232.5 388.5 L 1212.5 388.5 Z M 1160.5 368.5 L 1179.5 368.5 L 1179.5 388.5 L 1160.5 388.5 Z M 1107.5 368.5 L 1127.5 368.5 L 1127.5 388.5 L 1107.5 388.5 Z M 1055.5 368.5 L 1074.5 368.5 L 1074.5 388.5 L 1055.5 388.5 Z M 1002.5 368.5 L 1021.5 368.5 L 1021.5 388.5 L 1002.5 388.5 Z M 949.5 368.5 L 969.5 368.5 L 969.5 388.5 L 949.5 388.5 Z M 897.5 368.5 L 916.5 368.5 L 916.5 388.5 L 897.5 388.5 Z M 844.5 368.5 L 864.5 368.5 L 864.5 388.5 L 844.5 388.5 Z M 791.5 368.5 L 811.5 368.5 L 811.5 388.5 L 791.5 388.5 Z M 739.5 368.5 L 758.5 368.5 L 758.5 388.5 L 739.5 388.5 Z M 686.5 368.5 L 706.5 368.5 L 706.5 388.5 L 686.5 388.5 Z M 634.5 368.5 L 653.5 368.5 L 653.5 388.5 L 634.5 388.5 Z M 581.5 368.5 L 600.5 368.5 L 600.5 388.5 L 581.5 388.5 Z M 528.5 368.5 L 548.5 368.5 L 548.5 388.5 L 528.5 388.5 Z M 476.5 368.5 L 495.5 368.5 L 495.5 388.5 L 476.5 388.5 Z M 423.5 368.5 L 443.5 368.5 L 443.5 388.5 L 423.5 388.5 Z M 371.5 368.5 L 390.5 368.5 L 390.5 388.5 L 371.5 388.5 Z M 318.5 368.5 L 337.5 368.5 L 337.5 388.5 L 318.5 388.5 Z M 265.5 368.5 L 285.5 368.5 L 285.5 388.5 L 265.5 388.5 Z M 314.5 466.5 L 334.5 466.5 L 334.5 475.5 L 314.5 475.5 Z M 805.5 466.5 L 825.5 466.5 L 825.5 481.5 L 805.5 481.5 Z M 805.5 481.5 L 825.5 481.5 L 825.5 485.5 L 805.5 485.5 Z M 314.5 475.5 L 334.5 475.5 L 334.5 485.5 L 314.5 485.5 Z M 1162.5 466.5 L 1182.5 466.5 L 1182.5 485.5 L 1162.5 485.5 Z M 288.5 543.5 L 308.5 543.5 L 308.5 547.5 L 288.5 547.5 Z M 1305.5 543.5 L 1324.5 543.5 L 1324.5 548.5 L 1305.5 548.5 Z M 1158.5 543.5 L 1177.5 543.5 L 1177.5 553.5 L 1158.5 553.5 Z M 757.5 543.5 L 777.5 543.5 L 777.5 558.5 L 757.5 558.5 Z M 757.5 558.5 L 777.5 558.5 L 777.5 563.5 L 757.5 563.5 Z M 1305.5 548.5 L 1324.5 548.5 L 1324.5 563.5 L 1305.5 563.5 Z M 288.5 547.5 L 308.5 547.5 L 308.5 563.5 L 288.5 563.5 Z M 1158.5 553.5 L 1177.5 553.5 L 1177.5 563.5 L 1158.5 563.5 Z M 981.5 582.5 L 1001.5 582.5 L 1001.5 589.5 L 981.5 589.5 Z M 940.5 582.5 L 960.5 582.5 L 960.5 602.5 L 940.5 602.5 Z M 981.5 589.5 L 1001.5 589.5 L 1001.5 602.5 L 981.5 602.5 Z M 1334.5 582.5 L 1353.5 582.5 L 1353.5 602.5 L 1334.5 602.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 1686.5 680.5 L 1705.5 680.5 L 1705.5 699.5 L 1686.5 699.5 Z M 1633.5 680.5 L 1653.5 680.5 L 1653.5 699.5 L 1633.5 699.5 Z M 1581.5 680.5 L 1600.5 680.5 L 1600.5 699.5 L 1581.5 699.5 Z M 1528.5 680.5 L 1548.5 680.5 L 1548.5 699.5 L 1528.5 699.5 Z M 1476.5 680.5 L 1495.5 680.5 L 1495.5 699.5 L 1476.5 699.5 Z M 1423.5 680.5 L 1442.5 680.5 L 1442.5 699.5 L 1423.5 699.5 Z M 1370.5 680.5 L 1390.5 680.5 L 1390.5 699.5 L 1370.5 699.5 Z M 1318.5 680.5 L 1337.5 680.5 L 1337.5 699.5 L 1318.5 699.5 Z M 1265.5 680.5 L 1285.5 680.5 L 1285.5 699.5 L 1265.5 699.5 Z M 1212.5 680.5 L 1232.5 680.5 L 1232.5 699.5 L 1212.5 699.5 Z M 1160.5 680.5 L 1179.5 680.5 L 1179.5 699.5 L 1160.5 699.5 Z M 1107.5 680.5 L 1127.5 680.5 L 1127.5 699.5 L 1107.5 699.5 Z M 1055.5 680.5 L 1074.5 680.5 L 1074.5 699.5 L 1055.5 699.5 Z M 1002.5 680.5 L 1021.5 680.5 L 1021.5 699.5 L 1002.5 699.5 Z M 949.5 680.5 L 969.5 680.5 L 969.5 699.5 L 949.5 699.5 Z M 897.5 680.5 L 916.5 680.5 L 916.5 699.5 L 897.5 699.5 Z M 844.5 680.5 L 864.5 680.5 L 864.5 699.5 L 844.5 699.5 Z M 791.5 680.5 L 811.5 680.5 L 811.5 699.5 L 791.5 699.5 Z M 739.5 680.5 L 758.5 680.5 L 758.5 699.5 L 739.5 699.5 Z M 686.5 680.5 L 706.5 680.5 L 706.5 699.5 L 686.5 699.5 Z M 634.5 680.5 L 653.5 680.5 L 653.5 699.5 L 634.5 699.5 Z M 581.5 680.5 L 600.5 680.5 L 600.5 699.5 L 581.5 699.5 Z M 528.5 680.5 L 548.5 680.5 L 548.5 699.5 L 528.5 699.5 Z M 476.5 680.5 L 495.5 680.5 L 495.5 699.5 L 476.5 699.5 Z M 423.5 680.5 L 443.5 680.5 L 443.5 699.5 L 423.5 699.5 Z M 371.5 680.5 L 390.5 680.5 L 390.5 699.5 L 371.5 699.5 Z M 318.5 680.5 L 337.5 680.5 L 337.5 699.5 L 318.5 699.5 Z M 265.5 680.5 L 285.5 680.5 L 285.5 699.5 L 265.5 699.5 Z M 265.5 680.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,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 1433.492188 598.421875 L 1433.414062 599.675781 L 1433.21875 600.816406 L 1432.863281 601.875 L 1432.394531 602.820312 L 1431.765625 603.722656 L 1431.019531 604.507812 L 1430.195312 605.175781 L 1429.332031 605.683594 L 1428.347656 606.078125 L 1427.328125 606.390625 L 1426.226562 606.550781 L 1425.050781 606.589844 L 1412.128906 606.589844 L 1412.128906 577.960938 L 1423.753906 577.960938 L 1425.441406 578.078125 L 1426.933594 578.351562 L 1428.269531 578.824219 L 1429.410156 579.492188 L 1430.390625 580.355469 L 1431.175781 581.414062 L 1431.488281 582.003906 L 1431.765625 582.632812 L 1431.960938 583.222656 L 1432.117188 583.890625 L 1432.195312 584.558594 L 1432.234375 585.226562 L 1432.117188 586.640625 L 1431.765625 587.855469 L 1431.214844 588.996094 L 1430.429688 589.9375 L 1429.449219 590.800781 L 1428.269531 591.46875 L 1429.410156 591.980469 L 1430.390625 592.53125 L 1431.253906 593.15625 L 1431.960938 593.863281 L 1432.511719 594.609375 L 1432.941406 595.394531 L 1433.101562 595.867188 L 1433.21875 596.339844 L 1433.335938 596.808594 L 1433.414062 597.359375 L 1433.453125 597.871094 Z M 1428.585938 585.734375 L 1428.464844 584.558594 L 1428.113281 583.574219 L 1427.5625 582.710938 L 1426.777344 582.082031 L 1425.796875 581.613281 L 1424.578125 581.296875 L 1424.304688 581.296875 L 1424.027344 581.257812 L 1423.753906 581.21875 L 1423.125 581.21875 L 1422.851562 581.179688 L 1415.78125 581.179688 L 1415.78125 590.292969 L 1422.851562 590.292969 L 1424.304688 590.210938 L 1425.558594 589.976562 L 1426.621094 589.542969 L 1427.40625 588.957031 L 1428.035156 588.171875 L 1428.425781 587.226562 L 1428.464844 587.03125 L 1428.503906 586.796875 L 1428.542969 586.558594 L 1428.542969 586.011719 Z M 1424.695312 603.367188 L 1425.796875 603.328125 L 1426.777344 603.09375 L 1427.640625 602.699219 L 1428.347656 602.191406 L 1428.9375 601.523438 L 1429.410156 600.699219 L 1429.527344 600.382812 L 1429.605469 600.03125 L 1429.722656 599.636719 L 1429.761719 599.285156 L 1429.800781 598.890625 L 1429.839844 598.460938 L 1429.761719 597.59375 L 1429.605469 596.769531 L 1429.332031 596.0625 L 1428.9375 595.394531 L 1428.425781 594.847656 L 1427.839844 594.335938 L 1427.40625 594.101562 L 1426.933594 593.902344 L 1426.425781 593.746094 L 1425.875 593.628906 L 1425.285156 593.550781 L 1424.695312 593.511719 L 1415.78125 593.511719 L 1415.78125 603.367188 Z M 1424.695312 603.367188 "/>
 <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 1334 497 L 1353 497 M 1334 477 L 1353 477 M 1334 477 L 1334 497 M 1353 477 L 1353 497 " 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 1334 497 L 1353 497 M 1334 477 L 1353 477 M 1353 497 L 1353 477 M 1334 497 L 1334 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(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 385 L 196 394 M 191 390 L 200 390 M 195 391 L 197 391 M 195 389 L 197 389 M 195 389 L 195 391 M 197 389 L 197 391 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.svg b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.svg
index 6834e03..409a041 100644
--- a/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.svg
+++ b/cells/sdfrtn/sky130_fd_sc_hd__sdfrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 329.5 L 1743.5 329.5 L 1743.5 525.5 L 174.5 525.5 Z M 781.5 525.5 L 1743.5 525.5 L 1743.5 541.5 L 781.5 541.5 Z M 174.5 525.5 L 459.5 525.5 L 459.5 541.5 L 174.5 541.5 Z M 174.5 525.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" 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="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 712.5 L 230.5 712.5 L 230.5 715.5 L 227.5 715.5 Z M 227.5 712.5 "/>
 </clipPath>
 <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="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 603.5 580.5 L 622.5 580.5 L 622.5 635.5 L 603.5 635.5 Z M 555.5 580.5 L 575.5 580.5 L 575.5 635.5 L 555.5 635.5 Z M 673.5 615.5 L 739.5 615.5 L 739.5 670.5 L 673.5 670.5 Z M 766.5 615.5 L 790.5 615.5 L 790.5 670.5 L 766.5 670.5 Z M 431.5 615.5 L 451.5 615.5 L 451.5 670.5 L 431.5 670.5 Z M 1033.5 627.5 L 1053.5 627.5 L 1053.5 683.5 L 1033.5 683.5 Z M 1366.5 627.5 L 1386.5 627.5 L 1386.5 683.5 L 1366.5 683.5 Z M 1465.5 627.5 L 1484.5 627.5 L 1484.5 683.5 L 1465.5 683.5 Z M 1081.5 627.5 L 1101.5 627.5 L 1101.5 683.5 L 1081.5 683.5 Z M 1517.5 627.5 L 1537.5 627.5 L 1537.5 683.5 L 1517.5 683.5 Z M 1303.5 635.5 L 1323.5 635.5 L 1323.5 683.5 L 1303.5 683.5 Z M 307.5 597.5 L 326.5 597.5 L 326.5 683.5 L 307.5 683.5 Z M 1644.5 597.5 L 1664.5 597.5 L 1664.5 683.5 L 1644.5 683.5 Z M 1168.5 598.5 L 1188.5 598.5 L 1188.5 683.5 L 1168.5 683.5 Z M 251.5 597.5 L 271.5 597.5 L 271.5 683.5 L 251.5 683.5 Z M 963.5 635.5 L 983.5 635.5 L 983.5 683.5 L 963.5 683.5 Z M 1231.5 635.5 L 1251.5 635.5 L 1251.5 683.5 L 1231.5 683.5 Z M 897.5 635.5 L 917.5 635.5 L 917.5 683.5 L 897.5 683.5 Z M 897.5 635.5 "/>
 </clipPath>
-<image id="image370" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1520.5 385.5 L 1540.5 385.5 L 1540.5 441.5 L 1520.5 441.5 Z M 1395.5 385.5 L 1414.5 385.5 L 1414.5 441.5 L 1395.5 441.5 Z M 1097.5 385.5 L 1116.5 385.5 L 1116.5 441.5 L 1097.5 441.5 Z M 1021.5 385.5 L 1041.5 385.5 L 1041.5 441.5 L 1021.5 441.5 Z M 1340.5 385.5 L 1360.5 385.5 L 1360.5 441.5 L 1340.5 441.5 Z M 966.5 385.5 L 986.5 385.5 L 986.5 441.5 L 966.5 441.5 Z M 892.5 385.5 L 912.5 385.5 L 912.5 441.5 L 892.5 441.5 Z M 1465.5 385.5 L 1484.5 385.5 L 1484.5 441.5 L 1465.5 441.5 Z M 1284.5 385.5 L 1303.5 385.5 L 1303.5 441.5 L 1284.5 441.5 Z M 694.5 385.5 L 714.5 385.5 L 714.5 457.5 L 694.5 457.5 Z M 479.5 385.5 L 499.5 385.5 L 499.5 457.5 L 479.5 457.5 Z M 535.5 385.5 L 554.5 385.5 L 554.5 457.5 L 535.5 457.5 Z M 589.5 385.5 L 609.5 385.5 L 609.5 457.5 L 589.5 457.5 Z M 751.5 385.5 L 771.5 385.5 L 771.5 457.5 L 751.5 457.5 Z M 1221.5 385.5 L 1241.5 385.5 L 1241.5 496.5 L 1221.5 496.5 Z M 1644.5 385.5 L 1664.5 385.5 L 1664.5 517.5 L 1644.5 517.5 Z M 251.5 385.5 L 271.5 385.5 L 271.5 517.5 L 251.5 517.5 Z M 309.5 385.5 L 328.5 385.5 L 328.5 517.5 L 309.5 517.5 Z M 309.5 385.5 "/>
 </clipPath>
-<image id="image371" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 218.5 343.5 L 241.5 343.5 L 241.5 366.5 L 218.5 366.5 Z M 1677.5 343.5 L 1699.5 343.5 L 1699.5 366.5 L 1677.5 366.5 Z M 1616.5 343.5 L 1638.5 343.5 L 1638.5 366.5 L 1616.5 366.5 Z M 1555.5 343.5 L 1577.5 343.5 L 1577.5 366.5 L 1555.5 366.5 Z M 1494.5 343.5 L 1517.5 343.5 L 1517.5 366.5 L 1494.5 366.5 Z M 1433.5 343.5 L 1456.5 343.5 L 1456.5 366.5 L 1433.5 366.5 Z M 1373.5 343.5 L 1395.5 343.5 L 1395.5 366.5 L 1373.5 366.5 Z M 1312.5 343.5 L 1334.5 343.5 L 1334.5 366.5 L 1312.5 366.5 Z M 1251.5 343.5 L 1274.5 343.5 L 1274.5 366.5 L 1251.5 366.5 Z M 1190.5 343.5 L 1213.5 343.5 L 1213.5 366.5 L 1190.5 366.5 Z M 1130.5 343.5 L 1152.5 343.5 L 1152.5 366.5 L 1130.5 366.5 Z M 1069.5 343.5 L 1091.5 343.5 L 1091.5 366.5 L 1069.5 366.5 Z M 1008.5 343.5 L 1031.5 343.5 L 1031.5 366.5 L 1008.5 366.5 Z M 947.5 343.5 L 970.5 343.5 L 970.5 366.5 L 947.5 366.5 Z M 887.5 343.5 L 909.5 343.5 L 909.5 366.5 L 887.5 366.5 Z M 826.5 343.5 L 848.5 343.5 L 848.5 366.5 L 826.5 366.5 Z M 765.5 343.5 L 788.5 343.5 L 788.5 366.5 L 765.5 366.5 Z M 704.5 343.5 L 727.5 343.5 L 727.5 366.5 L 704.5 366.5 Z M 644.5 343.5 L 666.5 343.5 L 666.5 366.5 L 644.5 366.5 Z M 583.5 343.5 L 605.5 343.5 L 605.5 366.5 L 583.5 366.5 Z M 522.5 343.5 L 544.5 343.5 L 544.5 366.5 L 522.5 366.5 Z M 461.5 343.5 L 484.5 343.5 L 484.5 366.5 L 461.5 366.5 Z M 400.5 343.5 L 423.5 343.5 L 423.5 366.5 L 400.5 366.5 Z M 340.5 343.5 L 362.5 343.5 L 362.5 366.5 L 340.5 366.5 Z M 279.5 343.5 L 301.5 343.5 L 301.5 366.5 L 279.5 366.5 Z M 902.5 455.5 L 925.5 455.5 L 925.5 473.5 L 902.5 473.5 Z M 902.5 473.5 L 925.5 473.5 L 925.5 478.5 L 902.5 478.5 Z M 288.5 455.5 L 311.5 455.5 L 311.5 478.5 L 288.5 478.5 Z M 1315.5 455.5 L 1337.5 455.5 L 1337.5 478.5 L 1315.5 478.5 Z M 1479.5 545.5 L 1502.5 545.5 L 1502.5 550.5 L 1479.5 550.5 Z M 1309.5 545.5 L 1332.5 545.5 L 1332.5 556.5 L 1309.5 556.5 Z M 847.5 545.5 L 869.5 545.5 L 869.5 562.5 L 847.5 562.5 Z M 847.5 562.5 L 869.5 562.5 L 869.5 568.5 L 847.5 568.5 Z M 1479.5 550.5 L 1502.5 550.5 L 1502.5 568.5 L 1479.5 568.5 Z M 350.5 545.5 L 373.5 545.5 L 373.5 568.5 L 350.5 568.5 Z M 1309.5 556.5 L 1332.5 556.5 L 1332.5 568.5 L 1309.5 568.5 Z M 1106.5 590.5 L 1128.5 590.5 L 1128.5 598.5 L 1106.5 598.5 Z M 1058.5 590.5 L 1081.5 590.5 L 1081.5 613.5 L 1058.5 613.5 Z M 1106.5 598.5 L 1128.5 598.5 L 1128.5 613.5 L 1106.5 613.5 Z M 1513.5 590.5 L 1535.5 590.5 L 1535.5 613.5 L 1513.5 613.5 Z M 218.5 702.5 L 241.5 702.5 L 241.5 725.5 L 218.5 725.5 Z M 1677.5 702.5 L 1699.5 702.5 L 1699.5 725.5 L 1677.5 725.5 Z M 1616.5 702.5 L 1638.5 702.5 L 1638.5 725.5 L 1616.5 725.5 Z M 1555.5 702.5 L 1577.5 702.5 L 1577.5 725.5 L 1555.5 725.5 Z M 1494.5 702.5 L 1517.5 702.5 L 1517.5 725.5 L 1494.5 725.5 Z M 1433.5 702.5 L 1456.5 702.5 L 1456.5 725.5 L 1433.5 725.5 Z M 1373.5 702.5 L 1395.5 702.5 L 1395.5 725.5 L 1373.5 725.5 Z M 1312.5 702.5 L 1334.5 702.5 L 1334.5 725.5 L 1312.5 725.5 Z M 1251.5 702.5 L 1274.5 702.5 L 1274.5 725.5 L 1251.5 725.5 Z M 1190.5 702.5 L 1213.5 702.5 L 1213.5 725.5 L 1190.5 725.5 Z M 1130.5 702.5 L 1152.5 702.5 L 1152.5 725.5 L 1130.5 725.5 Z M 1069.5 702.5 L 1091.5 702.5 L 1091.5 725.5 L 1069.5 725.5 Z M 1008.5 702.5 L 1031.5 702.5 L 1031.5 725.5 L 1008.5 725.5 Z M 947.5 702.5 L 970.5 702.5 L 970.5 725.5 L 947.5 725.5 Z M 887.5 702.5 L 909.5 702.5 L 909.5 725.5 L 887.5 725.5 Z M 826.5 702.5 L 848.5 702.5 L 848.5 725.5 L 826.5 725.5 Z M 765.5 702.5 L 788.5 702.5 L 788.5 725.5 L 765.5 725.5 Z M 704.5 702.5 L 727.5 702.5 L 727.5 725.5 L 704.5 725.5 Z M 644.5 702.5 L 666.5 702.5 L 666.5 725.5 L 644.5 725.5 Z M 583.5 702.5 L 605.5 702.5 L 605.5 725.5 L 583.5 725.5 Z M 522.5 702.5 L 544.5 702.5 L 544.5 725.5 L 522.5 725.5 Z M 461.5 702.5 L 484.5 702.5 L 484.5 725.5 L 461.5 725.5 Z M 400.5 702.5 L 423.5 702.5 L 423.5 725.5 L 400.5 725.5 Z M 340.5 702.5 L 362.5 702.5 L 362.5 725.5 L 340.5 725.5 Z M 279.5 702.5 L 301.5 702.5 L 301.5 725.5 L 279.5 725.5 Z M 279.5 702.5 "/>
 </clipPath>
-<image id="image372" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface366">
+<g id="surface393">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,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 1703.425781 438.816406 L 1701.25 441.5 L 1696.390625 437.472656 L 1695.003906 438.214844 L 1693.613281 438.769531 L 1692.179688 439.230469 L 1690.652344 439.554688 L 1689.125 439.742188 L 1687.550781 439.832031 L 1685.421875 439.695312 L 1683.429688 439.371094 L 1681.578125 438.816406 L 1679.820312 438.074219 L 1678.15625 437.101562 L 1676.675781 435.851562 L 1675.332031 434.511719 L 1674.175781 432.984375 L 1673.25 431.316406 L 1672.460938 429.511719 L 1671.859375 427.570312 L 1671.488281 425.441406 L 1671.398438 424.929688 L 1671.351562 424.375 L 1671.304688 423.867188 L 1671.257812 423.3125 L 1671.257812 422.152344 L 1671.351562 419.839844 L 1671.675781 417.617188 L 1672.183594 415.582031 L 1672.925781 413.636719 L 1673.851562 411.832031 L 1675.054688 410.167969 L 1676.257812 408.824219 L 1677.644531 407.621094 L 1679.171875 406.601562 L 1680.792969 405.816406 L 1682.550781 405.167969 L 1684.496094 404.703125 L 1684.957031 404.660156 L 1685.46875 404.613281 L 1686.484375 404.519531 L 1686.996094 404.519531 L 1687.550781 404.472656 L 1689.632812 404.613281 L 1691.625 404.9375 L 1693.476562 405.492188 L 1695.234375 406.230469 L 1696.898438 407.203125 L 1698.425781 408.40625 L 1699.722656 409.796875 L 1700.878906 411.277344 L 1701.804688 412.898438 L 1702.59375 414.703125 L 1703.195312 416.644531 L 1703.609375 418.683594 L 1703.65625 419.285156 L 1703.796875 420.949219 L 1703.796875 421.503906 L 1703.84375 422.0625 L 1703.703125 424.652344 L 1703.285156 427.105469 L 1702.640625 429.375 L 1701.714844 431.503906 L 1700.511719 433.445312 L 1699.074219 435.25 Z M 1691.761719 429.28125 L 1695.882812 432.660156 L 1696.992188 431.269531 L 1697.917969 429.699219 L 1698.613281 427.984375 L 1699.121094 426.179688 L 1699.398438 424.234375 L 1699.539062 422.105469 L 1699.445312 420.164062 L 1699.167969 418.3125 L 1698.703125 416.597656 L 1698.101562 415.027344 L 1697.316406 413.542969 L 1696.34375 412.203125 L 1695.234375 411.09375 L 1694.078125 410.167969 L 1692.78125 409.425781 L 1691.390625 408.871094 L 1689.863281 408.5 L 1688.292969 408.269531 L 1687.550781 408.269531 L 1685.882812 408.40625 L 1684.3125 408.683594 L 1682.828125 409.148438 L 1681.488281 409.84375 L 1680.238281 410.722656 L 1679.125 411.785156 L 1678.0625 413.035156 L 1677.230469 414.425781 L 1676.535156 415.953125 L 1676.027344 417.617188 L 1675.703125 419.421875 L 1675.5625 421.367188 L 1675.5625 422.152344 L 1675.609375 424.191406 L 1675.886719 426.042969 L 1676.351562 427.753906 L 1676.953125 429.375 L 1677.785156 430.855469 L 1678.804688 432.152344 L 1679.867188 433.308594 L 1681.070312 434.234375 L 1682.367188 434.972656 L 1683.753906 435.484375 L 1685.28125 435.851562 L 1686.902344 435.992188 L 1686.996094 436.039062 L 1688.335938 436.039062 L 1689.214844 435.945312 L 1690.097656 435.761719 L 1690.929688 435.574219 L 1691.761719 435.296875 L 1692.640625 434.929688 L 1692.6875 434.929688 L 1692.78125 434.882812 L 1692.828125 434.835938 L 1692.917969 434.835938 L 1692.964844 434.789062 L 1693.058594 434.742188 L 1689.632812 431.875 Z M 1691.761719 429.28125 "/>
 <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 1675 669 L 1697 669 M 1675 646 L 1697 646 M 1675 646 L 1675 669 M 1697 646 L 1697 669 " 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 1675 669 L 1697 669 M 1675 646 L 1697 646 M 1697 669 L 1697 646 M 1675 669 L 1675 646 " 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 360 L 199 369 M 194 365 L 203 365 M 198 366 L 200 366 M 198 364 L 200 364 M 198 364 L 198 366 M 200 364 L 200 366 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.svg b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.svg
index 44efb78..9916f52 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 329.5 L 1743.5 329.5 L 1743.5 525.5 L 174.5 525.5 Z M 781.5 525.5 L 1743.5 525.5 L 1743.5 541.5 L 781.5 541.5 Z M 174.5 525.5 L 459.5 525.5 L 459.5 541.5 L 174.5 541.5 Z M 174.5 525.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" 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="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 227.5 712.5 L 230.5 712.5 L 230.5 715.5 L 227.5 715.5 Z M 227.5 712.5 "/>
 </clipPath>
 <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="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 603.5 580.5 L 622.5 580.5 L 622.5 635.5 L 603.5 635.5 Z M 555.5 580.5 L 575.5 580.5 L 575.5 635.5 L 555.5 635.5 Z M 673.5 615.5 L 739.5 615.5 L 739.5 670.5 L 673.5 670.5 Z M 766.5 615.5 L 790.5 615.5 L 790.5 670.5 L 766.5 670.5 Z M 431.5 615.5 L 451.5 615.5 L 451.5 670.5 L 431.5 670.5 Z M 1033.5 627.5 L 1053.5 627.5 L 1053.5 683.5 L 1033.5 683.5 Z M 1366.5 627.5 L 1386.5 627.5 L 1386.5 683.5 L 1366.5 683.5 Z M 1465.5 627.5 L 1484.5 627.5 L 1484.5 683.5 L 1465.5 683.5 Z M 1081.5 627.5 L 1101.5 627.5 L 1101.5 683.5 L 1081.5 683.5 Z M 1517.5 627.5 L 1537.5 627.5 L 1537.5 683.5 L 1517.5 683.5 Z M 1303.5 635.5 L 1323.5 635.5 L 1323.5 683.5 L 1303.5 683.5 Z M 307.5 597.5 L 326.5 597.5 L 326.5 683.5 L 307.5 683.5 Z M 1644.5 597.5 L 1664.5 597.5 L 1664.5 683.5 L 1644.5 683.5 Z M 1168.5 598.5 L 1188.5 598.5 L 1188.5 683.5 L 1168.5 683.5 Z M 251.5 597.5 L 271.5 597.5 L 271.5 683.5 L 251.5 683.5 Z M 963.5 635.5 L 983.5 635.5 L 983.5 683.5 L 963.5 683.5 Z M 1231.5 635.5 L 1251.5 635.5 L 1251.5 683.5 L 1231.5 683.5 Z M 897.5 635.5 L 917.5 635.5 L 917.5 683.5 L 897.5 683.5 Z M 897.5 635.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image385"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1520.5 385.5 L 1540.5 385.5 L 1540.5 441.5 L 1520.5 441.5 Z M 1395.5 385.5 L 1414.5 385.5 L 1414.5 441.5 L 1395.5 441.5 Z M 1097.5 385.5 L 1116.5 385.5 L 1116.5 441.5 L 1097.5 441.5 Z M 1021.5 385.5 L 1041.5 385.5 L 1041.5 441.5 L 1021.5 441.5 Z M 1340.5 385.5 L 1360.5 385.5 L 1360.5 441.5 L 1340.5 441.5 Z M 966.5 385.5 L 986.5 385.5 L 986.5 441.5 L 966.5 441.5 Z M 892.5 385.5 L 912.5 385.5 L 912.5 441.5 L 892.5 441.5 Z M 1465.5 385.5 L 1484.5 385.5 L 1484.5 441.5 L 1465.5 441.5 Z M 1284.5 385.5 L 1303.5 385.5 L 1303.5 441.5 L 1284.5 441.5 Z M 694.5 385.5 L 714.5 385.5 L 714.5 457.5 L 694.5 457.5 Z M 479.5 385.5 L 499.5 385.5 L 499.5 457.5 L 479.5 457.5 Z M 535.5 385.5 L 554.5 385.5 L 554.5 457.5 L 535.5 457.5 Z M 589.5 385.5 L 609.5 385.5 L 609.5 457.5 L 589.5 457.5 Z M 751.5 385.5 L 771.5 385.5 L 771.5 457.5 L 751.5 457.5 Z M 1221.5 385.5 L 1241.5 385.5 L 1241.5 496.5 L 1221.5 496.5 Z M 1644.5 385.5 L 1664.5 385.5 L 1664.5 517.5 L 1644.5 517.5 Z M 251.5 385.5 L 271.5 385.5 L 271.5 517.5 L 251.5 517.5 Z M 309.5 385.5 L 328.5 385.5 L 328.5 517.5 L 309.5 517.5 Z M 309.5 385.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 218.5 343.5 L 241.5 343.5 L 241.5 366.5 L 218.5 366.5 Z M 1677.5 343.5 L 1699.5 343.5 L 1699.5 366.5 L 1677.5 366.5 Z M 1616.5 343.5 L 1638.5 343.5 L 1638.5 366.5 L 1616.5 366.5 Z M 1555.5 343.5 L 1577.5 343.5 L 1577.5 366.5 L 1555.5 366.5 Z M 1494.5 343.5 L 1517.5 343.5 L 1517.5 366.5 L 1494.5 366.5 Z M 1433.5 343.5 L 1456.5 343.5 L 1456.5 366.5 L 1433.5 366.5 Z M 1373.5 343.5 L 1395.5 343.5 L 1395.5 366.5 L 1373.5 366.5 Z M 1312.5 343.5 L 1334.5 343.5 L 1334.5 366.5 L 1312.5 366.5 Z M 1251.5 343.5 L 1274.5 343.5 L 1274.5 366.5 L 1251.5 366.5 Z M 1190.5 343.5 L 1213.5 343.5 L 1213.5 366.5 L 1190.5 366.5 Z M 1130.5 343.5 L 1152.5 343.5 L 1152.5 366.5 L 1130.5 366.5 Z M 1069.5 343.5 L 1091.5 343.5 L 1091.5 366.5 L 1069.5 366.5 Z M 1008.5 343.5 L 1031.5 343.5 L 1031.5 366.5 L 1008.5 366.5 Z M 947.5 343.5 L 970.5 343.5 L 970.5 366.5 L 947.5 366.5 Z M 887.5 343.5 L 909.5 343.5 L 909.5 366.5 L 887.5 366.5 Z M 826.5 343.5 L 848.5 343.5 L 848.5 366.5 L 826.5 366.5 Z M 765.5 343.5 L 788.5 343.5 L 788.5 366.5 L 765.5 366.5 Z M 704.5 343.5 L 727.5 343.5 L 727.5 366.5 L 704.5 366.5 Z M 644.5 343.5 L 666.5 343.5 L 666.5 366.5 L 644.5 366.5 Z M 583.5 343.5 L 605.5 343.5 L 605.5 366.5 L 583.5 366.5 Z M 522.5 343.5 L 544.5 343.5 L 544.5 366.5 L 522.5 366.5 Z M 461.5 343.5 L 484.5 343.5 L 484.5 366.5 L 461.5 366.5 Z M 400.5 343.5 L 423.5 343.5 L 423.5 366.5 L 400.5 366.5 Z M 340.5 343.5 L 362.5 343.5 L 362.5 366.5 L 340.5 366.5 Z M 279.5 343.5 L 301.5 343.5 L 301.5 366.5 L 279.5 366.5 Z M 336.5 455.5 L 358.5 455.5 L 358.5 466.5 L 336.5 466.5 Z M 902.5 455.5 L 925.5 455.5 L 925.5 473.5 L 902.5 473.5 Z M 902.5 473.5 L 925.5 473.5 L 925.5 478.5 L 902.5 478.5 Z M 336.5 466.5 L 358.5 466.5 L 358.5 478.5 L 336.5 478.5 Z M 1315.5 455.5 L 1337.5 455.5 L 1337.5 478.5 L 1315.5 478.5 Z M 305.5 545.5 L 328.5 545.5 L 328.5 549.5 L 305.5 549.5 Z M 1479.5 545.5 L 1502.5 545.5 L 1502.5 550.5 L 1479.5 550.5 Z M 1309.5 545.5 L 1332.5 545.5 L 1332.5 556.5 L 1309.5 556.5 Z M 847.5 545.5 L 869.5 545.5 L 869.5 562.5 L 847.5 562.5 Z M 847.5 562.5 L 869.5 562.5 L 869.5 568.5 L 847.5 568.5 Z M 1479.5 550.5 L 1502.5 550.5 L 1502.5 568.5 L 1479.5 568.5 Z M 305.5 549.5 L 328.5 549.5 L 328.5 568.5 L 305.5 568.5 Z M 1309.5 556.5 L 1332.5 556.5 L 1332.5 568.5 L 1309.5 568.5 Z M 1106.5 590.5 L 1128.5 590.5 L 1128.5 598.5 L 1106.5 598.5 Z M 1058.5 590.5 L 1081.5 590.5 L 1081.5 613.5 L 1058.5 613.5 Z M 1106.5 598.5 L 1128.5 598.5 L 1128.5 613.5 L 1106.5 613.5 Z M 1513.5 590.5 L 1535.5 590.5 L 1535.5 613.5 L 1513.5 613.5 Z M 218.5 702.5 L 241.5 702.5 L 241.5 725.5 L 218.5 725.5 Z M 1677.5 702.5 L 1699.5 702.5 L 1699.5 725.5 L 1677.5 725.5 Z M 1616.5 702.5 L 1638.5 702.5 L 1638.5 725.5 L 1616.5 725.5 Z M 1555.5 702.5 L 1577.5 702.5 L 1577.5 725.5 L 1555.5 725.5 Z M 1494.5 702.5 L 1517.5 702.5 L 1517.5 725.5 L 1494.5 725.5 Z M 1433.5 702.5 L 1456.5 702.5 L 1456.5 725.5 L 1433.5 725.5 Z M 1373.5 702.5 L 1395.5 702.5 L 1395.5 725.5 L 1373.5 725.5 Z M 1312.5 702.5 L 1334.5 702.5 L 1334.5 725.5 L 1312.5 725.5 Z M 1251.5 702.5 L 1274.5 702.5 L 1274.5 725.5 L 1251.5 725.5 Z M 1190.5 702.5 L 1213.5 702.5 L 1213.5 725.5 L 1190.5 725.5 Z M 1130.5 702.5 L 1152.5 702.5 L 1152.5 725.5 L 1130.5 725.5 Z M 1069.5 702.5 L 1091.5 702.5 L 1091.5 725.5 L 1069.5 725.5 Z M 1008.5 702.5 L 1031.5 702.5 L 1031.5 725.5 L 1008.5 725.5 Z M 947.5 702.5 L 970.5 702.5 L 970.5 725.5 L 947.5 725.5 Z M 887.5 702.5 L 909.5 702.5 L 909.5 725.5 L 887.5 725.5 Z M 826.5 702.5 L 848.5 702.5 L 848.5 725.5 L 826.5 725.5 Z M 765.5 702.5 L 788.5 702.5 L 788.5 725.5 L 765.5 725.5 Z M 704.5 702.5 L 727.5 702.5 L 727.5 725.5 L 704.5 725.5 Z M 644.5 702.5 L 666.5 702.5 L 666.5 725.5 L 644.5 725.5 Z M 583.5 702.5 L 605.5 702.5 L 605.5 725.5 L 583.5 725.5 Z M 522.5 702.5 L 544.5 702.5 L 544.5 725.5 L 522.5 725.5 Z M 461.5 702.5 L 484.5 702.5 L 484.5 725.5 L 461.5 725.5 Z M 400.5 702.5 L 423.5 702.5 L 423.5 725.5 L 400.5 725.5 Z M 340.5 702.5 L 362.5 702.5 L 362.5 725.5 L 340.5 725.5 Z M 279.5 702.5 L 301.5 702.5 L 301.5 725.5 L 279.5 725.5 Z M 279.5 702.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image387"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface354">
+<g id="surface381">
 <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 1703.425781 438.816406 L 1701.25 441.5 L 1696.390625 437.472656 L 1695.003906 438.214844 L 1693.613281 438.769531 L 1692.179688 439.230469 L 1690.652344 439.554688 L 1689.125 439.742188 L 1687.550781 439.832031 L 1685.421875 439.695312 L 1683.429688 439.371094 L 1681.578125 438.816406 L 1679.820312 438.074219 L 1678.15625 437.101562 L 1676.675781 435.851562 L 1675.332031 434.511719 L 1674.175781 432.984375 L 1673.25 431.316406 L 1672.460938 429.511719 L 1671.859375 427.570312 L 1671.488281 425.441406 L 1671.398438 424.929688 L 1671.351562 424.375 L 1671.304688 423.867188 L 1671.257812 423.3125 L 1671.257812 422.152344 L 1671.351562 419.839844 L 1671.675781 417.617188 L 1672.183594 415.582031 L 1672.925781 413.636719 L 1673.851562 411.832031 L 1675.054688 410.167969 L 1676.257812 408.824219 L 1677.644531 407.621094 L 1679.171875 406.601562 L 1680.792969 405.816406 L 1682.550781 405.167969 L 1684.496094 404.703125 L 1684.957031 404.660156 L 1685.46875 404.613281 L 1686.484375 404.519531 L 1686.996094 404.519531 L 1687.550781 404.472656 L 1689.632812 404.613281 L 1691.625 404.9375 L 1693.476562 405.492188 L 1695.234375 406.230469 L 1696.898438 407.203125 L 1698.425781 408.40625 L 1699.722656 409.796875 L 1700.878906 411.277344 L 1701.804688 412.898438 L 1702.59375 414.703125 L 1703.195312 416.644531 L 1703.609375 418.683594 L 1703.65625 419.285156 L 1703.796875 420.949219 L 1703.796875 421.503906 L 1703.84375 422.0625 L 1703.703125 424.652344 L 1703.285156 427.105469 L 1702.640625 429.375 L 1701.714844 431.503906 L 1700.511719 433.445312 L 1699.074219 435.25 Z M 1691.761719 429.28125 L 1695.882812 432.660156 L 1696.992188 431.269531 L 1697.917969 429.699219 L 1698.613281 427.984375 L 1699.121094 426.179688 L 1699.398438 424.234375 L 1699.539062 422.105469 L 1699.445312 420.164062 L 1699.167969 418.3125 L 1698.703125 416.597656 L 1698.101562 415.027344 L 1697.316406 413.542969 L 1696.34375 412.203125 L 1695.234375 411.09375 L 1694.078125 410.167969 L 1692.78125 409.425781 L 1691.390625 408.871094 L 1689.863281 408.5 L 1688.292969 408.269531 L 1687.550781 408.269531 L 1685.882812 408.40625 L 1684.3125 408.683594 L 1682.828125 409.148438 L 1681.488281 409.84375 L 1680.238281 410.722656 L 1679.125 411.785156 L 1678.0625 413.035156 L 1677.230469 414.425781 L 1676.535156 415.953125 L 1676.027344 417.617188 L 1675.703125 419.421875 L 1675.5625 421.367188 L 1675.5625 422.152344 L 1675.609375 424.191406 L 1675.886719 426.042969 L 1676.351562 427.753906 L 1676.953125 429.375 L 1677.785156 430.855469 L 1678.804688 432.152344 L 1679.867188 433.308594 L 1681.070312 434.234375 L 1682.367188 434.972656 L 1683.753906 435.484375 L 1685.28125 435.851562 L 1686.902344 435.992188 L 1686.996094 436.039062 L 1688.335938 436.039062 L 1689.214844 435.945312 L 1690.097656 435.761719 L 1690.929688 435.574219 L 1691.761719 435.296875 L 1692.640625 434.929688 L 1692.6875 434.929688 L 1692.78125 434.882812 L 1692.828125 434.835938 L 1692.917969 434.835938 L 1692.964844 434.789062 L 1693.058594 434.742188 L 1689.632812 431.875 Z M 1691.761719 429.28125 "/>
 <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 1675 669 L 1697 669 M 1675 646 L 1697 646 M 1675 646 L 1675 669 M 1697 646 L 1697 669 " 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 1675 669 L 1697 669 M 1675 646 L 1697 646 M 1697 669 L 1697 646 M 1675 669 L 1675 646 " 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 360 L 199 369 M 194 365 L 203 365 M 198 366 L 200 366 M 198 364 L 200 364 M 198 364 L 198 366 M 200 364 L 200 366 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.svg b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.svg
index 4c01167..6f89123 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 526.5 L 174.5 526.5 Z M 759.5 526.5 L 1744.5 526.5 L 1744.5 541.5 L 759.5 541.5 Z M 174.5 526.5 L 449.5 526.5 L 449.5 541.5 L 174.5 541.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 705.5 L 228.5 705.5 L 228.5 708.5 L 226.5 708.5 Z M 226.5 705.5 "/>
 </clipPath>
 <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="#image386"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 587.5 578.5 L 606.5 578.5 L 606.5 631.5 L 587.5 631.5 Z M 541.5 578.5 L 560.5 578.5 L 560.5 631.5 L 541.5 631.5 Z M 421.5 611.5 L 441.5 611.5 L 441.5 665.5 L 421.5 665.5 Z M 654.5 611.5 L 718.5 611.5 L 718.5 665.5 L 654.5 665.5 Z M 745.5 611.5 L 767.5 611.5 L 767.5 665.5 L 745.5 665.5 Z M 1322.5 624.5 L 1341.5 624.5 L 1341.5 677.5 L 1322.5 677.5 Z M 1001.5 624.5 L 1021.5 624.5 L 1021.5 677.5 L 1001.5 677.5 Z M 1417.5 624.5 L 1436.5 624.5 L 1436.5 677.5 L 1417.5 677.5 Z M 1467.5 624.5 L 1486.5 624.5 L 1486.5 677.5 L 1467.5 677.5 Z M 1047.5 624.5 L 1066.5 624.5 L 1066.5 677.5 L 1047.5 677.5 Z M 249.5 594.5 L 268.5 594.5 L 268.5 677.5 L 249.5 677.5 Z M 870.5 631.5 L 890.5 631.5 L 890.5 677.5 L 870.5 677.5 Z M 302.5 594.5 L 321.5 594.5 L 321.5 677.5 L 302.5 677.5 Z M 1131.5 596.5 L 1150.5 596.5 L 1150.5 677.5 L 1131.5 677.5 Z M 1643.5 594.5 L 1662.5 594.5 L 1662.5 677.5 L 1643.5 677.5 Z M 934.5 631.5 L 953.5 631.5 L 953.5 677.5 L 934.5 677.5 Z M 1261.5 631.5 L 1280.5 631.5 L 1280.5 677.5 L 1261.5 677.5 Z M 1590.5 594.5 L 1609.5 594.5 L 1609.5 677.5 L 1590.5 677.5 Z M 1192.5 631.5 L 1211.5 631.5 L 1211.5 677.5 L 1192.5 677.5 Z M 1192.5 631.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image387"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1470.5 391.5 L 1489.5 391.5 L 1489.5 444.5 L 1470.5 444.5 Z M 1417.5 391.5 L 1436.5 391.5 L 1436.5 444.5 L 1417.5 444.5 Z M 1063.5 391.5 L 1082.5 391.5 L 1082.5 444.5 L 1063.5 444.5 Z M 1349.5 391.5 L 1368.5 391.5 L 1368.5 444.5 L 1349.5 444.5 Z M 990.5 391.5 L 1009.5 391.5 L 1009.5 444.5 L 990.5 444.5 Z M 937.5 391.5 L 956.5 391.5 L 956.5 444.5 L 937.5 444.5 Z M 1297.5 391.5 L 1316.5 391.5 L 1316.5 444.5 L 1297.5 444.5 Z M 865.5 391.5 L 884.5 391.5 L 884.5 444.5 L 865.5 444.5 Z M 1243.5 391.5 L 1262.5 391.5 L 1262.5 444.5 L 1243.5 444.5 Z M 573.5 391.5 L 593.5 391.5 L 593.5 460.5 L 573.5 460.5 Z M 521.5 391.5 L 540.5 391.5 L 540.5 460.5 L 521.5 460.5 Z M 468.5 391.5 L 487.5 391.5 L 487.5 460.5 L 468.5 460.5 Z M 675.5 391.5 L 694.5 391.5 L 694.5 460.5 L 675.5 460.5 Z M 730.5 391.5 L 749.5 391.5 L 749.5 460.5 L 730.5 460.5 Z M 1182.5 391.5 L 1201.5 391.5 L 1201.5 498.5 L 1182.5 498.5 Z M 1590.5 391.5 L 1609.5 391.5 L 1609.5 518.5 L 1590.5 518.5 Z M 304.5 391.5 L 323.5 391.5 L 323.5 518.5 L 304.5 518.5 Z M 249.5 391.5 L 268.5 391.5 L 268.5 518.5 L 249.5 518.5 Z M 1643.5 391.5 L 1662.5 391.5 L 1662.5 518.5 L 1643.5 518.5 Z M 1643.5 391.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 330.5 458.5 L 352.5 458.5 L 352.5 468.5 L 330.5 468.5 Z M 876.5 458.5 L 897.5 458.5 L 897.5 475.5 L 876.5 475.5 Z M 876.5 475.5 L 897.5 475.5 L 897.5 480.5 L 876.5 480.5 Z M 330.5 468.5 L 352.5 468.5 L 352.5 480.5 L 330.5 480.5 Z M 1272.5 458.5 L 1294.5 458.5 L 1294.5 480.5 L 1272.5 480.5 Z M 301.5 545.5 L 322.5 545.5 L 322.5 549.5 L 301.5 549.5 Z M 1431.5 545.5 L 1452.5 545.5 L 1452.5 550.5 L 1431.5 550.5 Z M 1267.5 545.5 L 1289.5 545.5 L 1289.5 555.5 L 1267.5 555.5 Z M 822.5 545.5 L 844.5 545.5 L 844.5 561.5 L 822.5 561.5 Z M 822.5 561.5 L 844.5 561.5 L 844.5 566.5 L 822.5 566.5 Z M 1431.5 550.5 L 1452.5 550.5 L 1452.5 566.5 L 1431.5 566.5 Z M 301.5 549.5 L 322.5 549.5 L 322.5 566.5 L 301.5 566.5 Z M 1267.5 555.5 L 1289.5 555.5 L 1289.5 566.5 L 1267.5 566.5 Z M 1071.5 588.5 L 1093.5 588.5 L 1093.5 596.5 L 1071.5 596.5 Z M 1026.5 588.5 L 1047.5 588.5 L 1047.5 610.5 L 1026.5 610.5 Z M 1071.5 596.5 L 1093.5 596.5 L 1093.5 610.5 L 1071.5 610.5 Z M 1463.5 588.5 L 1485.5 588.5 L 1485.5 610.5 L 1463.5 610.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface383">
 <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 1646.371094 441.976562 L 1644.324219 444.5 L 1639.761719 440.71875 L 1638.457031 441.414062 L 1637.152344 441.933594 L 1635.804688 442.371094 L 1634.371094 442.675781 L 1632.933594 442.847656 L 1631.457031 442.933594 L 1629.457031 442.804688 L 1627.585938 442.5 L 1625.847656 441.976562 L 1624.195312 441.28125 L 1622.628906 440.371094 L 1621.238281 439.195312 L 1619.976562 437.933594 L 1618.890625 436.5 L 1618.023438 434.933594 L 1617.28125 433.238281 L 1616.71875 431.414062 L 1616.371094 429.414062 L 1616.28125 428.933594 L 1616.238281 428.414062 L 1616.195312 427.933594 L 1616.152344 427.414062 L 1616.152344 426.324219 L 1616.238281 424.152344 L 1616.542969 422.066406 L 1617.023438 420.152344 L 1617.71875 418.324219 L 1618.585938 416.628906 L 1619.71875 415.066406 L 1620.847656 413.804688 L 1622.152344 412.675781 L 1623.585938 411.71875 L 1625.109375 410.976562 L 1626.761719 410.371094 L 1628.585938 409.933594 L 1629.023438 409.890625 L 1629.976562 409.804688 L 1630.457031 409.761719 L 1630.933594 409.761719 L 1631.457031 409.71875 L 1633.414062 409.847656 L 1635.28125 410.152344 L 1637.023438 410.675781 L 1638.675781 411.371094 L 1640.238281 412.28125 L 1641.675781 413.414062 L 1642.890625 414.71875 L 1643.976562 416.109375 L 1644.847656 417.628906 L 1645.585938 419.324219 L 1646.152344 421.152344 L 1646.542969 423.066406 L 1646.585938 423.628906 L 1646.628906 424.152344 L 1646.675781 424.675781 L 1646.71875 425.195312 L 1646.71875 425.71875 L 1646.761719 426.238281 L 1646.628906 428.675781 L 1646.238281 430.976562 L 1645.628906 433.109375 L 1644.761719 435.109375 L 1643.628906 436.933594 L 1642.28125 438.628906 Z M 1635.414062 433.023438 L 1639.28125 436.195312 L 1640.324219 434.890625 L 1641.195312 433.414062 L 1641.847656 431.804688 L 1642.324219 430.109375 L 1642.585938 428.28125 L 1642.71875 426.28125 L 1642.628906 424.457031 L 1642.371094 422.71875 L 1641.933594 421.109375 L 1641.371094 419.628906 L 1640.628906 418.238281 L 1639.71875 416.976562 L 1638.675781 415.933594 L 1637.585938 415.066406 L 1636.371094 414.371094 L 1635.066406 413.847656 L 1633.628906 413.5 L 1632.152344 413.28125 L 1631.457031 413.28125 L 1629.890625 413.414062 L 1628.414062 413.675781 L 1627.023438 414.109375 L 1625.761719 414.761719 L 1624.585938 415.585938 L 1623.542969 416.585938 L 1622.542969 417.761719 L 1621.761719 419.066406 L 1621.109375 420.5 L 1620.628906 422.066406 L 1620.324219 423.761719 L 1620.195312 425.585938 L 1620.195312 426.324219 L 1620.238281 428.238281 L 1620.5 429.976562 L 1620.933594 431.585938 L 1621.5 433.109375 L 1622.28125 434.5 L 1623.238281 435.71875 L 1624.238281 436.804688 L 1625.371094 437.675781 L 1626.585938 438.371094 L 1627.890625 438.847656 L 1629.324219 439.195312 L 1630.847656 439.324219 L 1630.933594 439.371094 L 1632.195312 439.371094 L 1633.023438 439.28125 L 1633.847656 439.109375 L 1634.628906 438.933594 L 1635.414062 438.675781 L 1636.238281 438.324219 L 1636.28125 438.324219 L 1636.371094 438.28125 L 1636.414062 438.238281 L 1636.5 438.238281 L 1636.542969 438.195312 L 1636.628906 438.152344 L 1633.414062 435.457031 Z M 1635.414062 433.023438 "/>
 <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 1619 664 L 1641 664 M 1619 642 L 1641 642 M 1619 642 L 1619 664 M 1641 642 L 1641 664 " 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 1619 664 L 1641 664 M 1619 642 L 1641 642 M 1641 664 L 1641 642 M 1619 664 L 1619 642 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.svg b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.svg
index 4dfe46a..227995e 100644
--- a/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hd__sdfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 350.5 L 1743.5 350.5 L 1743.5 526.5 L 174.5 526.5 Z M 718.5 526.5 L 1743.5 526.5 L 1743.5 540.5 L 718.5 540.5 Z M 174.5 526.5 L 430.5 526.5 L 430.5 540.5 L 174.5 540.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 222.5 693.5 L 224.5 693.5 L 224.5 696.5 L 222.5 696.5 Z M 222.5 693.5 "/>
 </clipPath>
 <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="#image386"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 558.5 575.5 L 576.5 575.5 L 576.5 624.5 L 558.5 624.5 Z M 516.5 575.5 L 533.5 575.5 L 533.5 624.5 L 516.5 624.5 Z M 705.5 606.5 L 726.5 606.5 L 726.5 656.5 L 705.5 656.5 Z M 404.5 606.5 L 422.5 606.5 L 422.5 656.5 L 404.5 656.5 Z M 621.5 606.5 L 680.5 606.5 L 680.5 656.5 L 621.5 656.5 Z M 1377.5 617.5 L 1395.5 617.5 L 1395.5 667.5 L 1377.5 667.5 Z M 1330.5 617.5 L 1348.5 617.5 L 1348.5 667.5 L 1330.5 667.5 Z M 1242.5 617.5 L 1260.5 617.5 L 1260.5 667.5 L 1242.5 667.5 Z M 944.5 617.5 L 962.5 617.5 L 962.5 667.5 L 944.5 667.5 Z M 987.5 617.5 L 1004.5 617.5 L 1004.5 667.5 L 987.5 667.5 Z M 1491.5 590.5 L 1509.5 590.5 L 1509.5 667.5 L 1491.5 667.5 Z M 881.5 624.5 L 899.5 624.5 L 899.5 667.5 L 881.5 667.5 Z M 243.5 590.5 L 261.5 590.5 L 261.5 667.5 L 243.5 667.5 Z M 1065.5 591.5 L 1082.5 591.5 L 1082.5 667.5 L 1065.5 667.5 Z M 1592.5 590.5 L 1610.5 590.5 L 1610.5 667.5 L 1592.5 667.5 Z M 1642.5 590.5 L 1659.5 590.5 L 1659.5 667.5 L 1642.5 667.5 Z M 1541.5 590.5 L 1559.5 590.5 L 1559.5 667.5 L 1541.5 667.5 Z M 822.5 624.5 L 840.5 624.5 L 840.5 667.5 L 822.5 667.5 Z M 293.5 590.5 L 311.5 590.5 L 311.5 667.5 L 293.5 667.5 Z M 1185.5 624.5 L 1203.5 624.5 L 1203.5 667.5 L 1185.5 667.5 Z M 1121.5 624.5 L 1139.5 624.5 L 1139.5 667.5 L 1121.5 667.5 Z M 1121.5 624.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image387"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1380.5 401.5 L 1398.5 401.5 L 1398.5 450.5 L 1380.5 450.5 Z M 1219.5 401.5 L 1237.5 401.5 L 1237.5 450.5 L 1219.5 450.5 Z M 1168.5 401.5 L 1186.5 401.5 L 1186.5 450.5 L 1168.5 450.5 Z M 1001.5 401.5 L 1019.5 401.5 L 1019.5 450.5 L 1001.5 450.5 Z M 1330.5 401.5 L 1348.5 401.5 L 1348.5 450.5 L 1330.5 450.5 Z M 933.5 401.5 L 951.5 401.5 L 951.5 450.5 L 933.5 450.5 Z M 884.5 401.5 L 901.5 401.5 L 901.5 450.5 L 884.5 450.5 Z M 1268.5 401.5 L 1285.5 401.5 L 1285.5 450.5 L 1268.5 450.5 Z M 817.5 401.5 L 835.5 401.5 L 835.5 450.5 L 817.5 450.5 Z M 448.5 401.5 L 465.5 401.5 L 465.5 465.5 L 448.5 465.5 Z M 640.5 401.5 L 658.5 401.5 L 658.5 465.5 L 640.5 465.5 Z M 546.5 401.5 L 564.5 401.5 L 564.5 465.5 L 546.5 465.5 Z M 497.5 401.5 L 515.5 401.5 L 515.5 465.5 L 497.5 465.5 Z M 691.5 401.5 L 709.5 401.5 L 709.5 465.5 L 691.5 465.5 Z M 1112.5 401.5 L 1130.5 401.5 L 1130.5 500.5 L 1112.5 500.5 Z M 1491.5 401.5 L 1509.5 401.5 L 1509.5 519.5 L 1491.5 519.5 Z M 243.5 401.5 L 261.5 401.5 L 261.5 519.5 L 243.5 519.5 Z M 1592.5 401.5 L 1610.5 401.5 L 1610.5 519.5 L 1592.5 519.5 Z M 295.5 401.5 L 313.5 401.5 L 313.5 519.5 L 295.5 519.5 Z M 1541.5 401.5 L 1559.5 401.5 L 1559.5 519.5 L 1541.5 519.5 Z M 1642.5 401.5 L 1659.5 401.5 L 1659.5 519.5 L 1642.5 519.5 Z M 1642.5 401.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 214.5 363.5 L 234.5 363.5 L 234.5 383.5 L 214.5 383.5 Z M 1684.5 363.5 L 1704.5 363.5 L 1704.5 383.5 L 1684.5 383.5 Z M 1629.5 363.5 L 1649.5 363.5 L 1649.5 383.5 L 1629.5 383.5 Z M 1575.5 363.5 L 1595.5 363.5 L 1595.5 383.5 L 1575.5 383.5 Z M 1520.5 363.5 L 1541.5 363.5 L 1541.5 383.5 L 1520.5 383.5 Z M 1466.5 363.5 L 1486.5 363.5 L 1486.5 383.5 L 1466.5 383.5 Z M 1412.5 363.5 L 1432.5 363.5 L 1432.5 383.5 L 1412.5 383.5 Z M 1357.5 363.5 L 1377.5 363.5 L 1377.5 383.5 L 1357.5 383.5 Z M 1303.5 363.5 L 1323.5 363.5 L 1323.5 383.5 L 1303.5 383.5 Z M 1248.5 363.5 L 1268.5 363.5 L 1268.5 383.5 L 1248.5 383.5 Z M 1194.5 363.5 L 1214.5 363.5 L 1214.5 383.5 L 1194.5 383.5 Z M 1139.5 363.5 L 1159.5 363.5 L 1159.5 383.5 L 1139.5 383.5 Z M 1085.5 363.5 L 1105.5 363.5 L 1105.5 383.5 L 1085.5 383.5 Z M 1030.5 363.5 L 1051.5 363.5 L 1051.5 383.5 L 1030.5 383.5 Z M 976.5 363.5 L 996.5 363.5 L 996.5 383.5 L 976.5 383.5 Z M 922.5 363.5 L 942.5 363.5 L 942.5 383.5 L 922.5 383.5 Z M 867.5 363.5 L 887.5 363.5 L 887.5 383.5 L 867.5 383.5 Z M 813.5 363.5 L 833.5 363.5 L 833.5 383.5 L 813.5 383.5 Z M 758.5 363.5 L 778.5 363.5 L 778.5 383.5 L 758.5 383.5 Z M 704.5 363.5 L 724.5 363.5 L 724.5 383.5 L 704.5 383.5 Z M 649.5 363.5 L 669.5 363.5 L 669.5 383.5 L 649.5 383.5 Z M 595.5 363.5 L 615.5 363.5 L 615.5 383.5 L 595.5 383.5 Z M 540.5 363.5 L 561.5 363.5 L 561.5 383.5 L 540.5 383.5 Z M 486.5 363.5 L 506.5 363.5 L 506.5 383.5 L 486.5 383.5 Z M 432.5 363.5 L 452.5 363.5 L 452.5 383.5 L 432.5 383.5 Z M 377.5 363.5 L 397.5 363.5 L 397.5 383.5 L 377.5 383.5 Z M 323.5 363.5 L 343.5 363.5 L 343.5 383.5 L 323.5 383.5 Z M 268.5 363.5 L 288.5 363.5 L 288.5 383.5 L 268.5 383.5 Z M 319.5 463.5 L 339.5 463.5 L 339.5 473.5 L 319.5 473.5 Z M 827.5 463.5 L 847.5 463.5 L 847.5 479.5 L 827.5 479.5 Z M 827.5 479.5 L 847.5 479.5 L 847.5 483.5 L 827.5 483.5 Z M 319.5 473.5 L 339.5 473.5 L 339.5 483.5 L 319.5 483.5 Z M 1196.5 463.5 L 1216.5 463.5 L 1216.5 483.5 L 1196.5 483.5 Z M 292.5 544.5 L 312.5 544.5 L 312.5 547.5 L 292.5 547.5 Z M 1343.5 544.5 L 1364.5 544.5 L 1364.5 549.5 L 1343.5 549.5 Z M 1191.5 544.5 L 1211.5 544.5 L 1211.5 553.5 L 1191.5 553.5 Z M 777.5 544.5 L 797.5 544.5 L 797.5 559.5 L 777.5 559.5 Z M 777.5 559.5 L 797.5 559.5 L 797.5 564.5 L 777.5 564.5 Z M 1343.5 549.5 L 1364.5 549.5 L 1364.5 564.5 L 1343.5 564.5 Z M 292.5 547.5 L 312.5 547.5 L 312.5 564.5 L 292.5 564.5 Z M 1191.5 553.5 L 1211.5 553.5 L 1211.5 564.5 L 1191.5 564.5 Z M 1009.5 584.5 L 1029.5 584.5 L 1029.5 591.5 L 1009.5 591.5 Z M 967.5 584.5 L 987.5 584.5 L 987.5 604.5 L 967.5 604.5 Z M 1009.5 591.5 L 1029.5 591.5 L 1029.5 604.5 L 1009.5 604.5 Z M 1374.5 584.5 L 1394.5 584.5 L 1394.5 604.5 L 1374.5 604.5 Z M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 1684.5 685.5 L 1704.5 685.5 L 1704.5 705.5 L 1684.5 705.5 Z M 1629.5 685.5 L 1649.5 685.5 L 1649.5 705.5 L 1629.5 705.5 Z M 1575.5 685.5 L 1595.5 685.5 L 1595.5 705.5 L 1575.5 705.5 Z M 1520.5 685.5 L 1541.5 685.5 L 1541.5 705.5 L 1520.5 705.5 Z M 1466.5 685.5 L 1486.5 685.5 L 1486.5 705.5 L 1466.5 705.5 Z M 1412.5 685.5 L 1432.5 685.5 L 1432.5 705.5 L 1412.5 705.5 Z M 1357.5 685.5 L 1377.5 685.5 L 1377.5 705.5 L 1357.5 705.5 Z M 1303.5 685.5 L 1323.5 685.5 L 1323.5 705.5 L 1303.5 705.5 Z M 1248.5 685.5 L 1268.5 685.5 L 1268.5 705.5 L 1248.5 705.5 Z M 1194.5 685.5 L 1214.5 685.5 L 1214.5 705.5 L 1194.5 705.5 Z M 1139.5 685.5 L 1159.5 685.5 L 1159.5 705.5 L 1139.5 705.5 Z M 1085.5 685.5 L 1105.5 685.5 L 1105.5 705.5 L 1085.5 705.5 Z M 1030.5 685.5 L 1051.5 685.5 L 1051.5 705.5 L 1030.5 705.5 Z M 976.5 685.5 L 996.5 685.5 L 996.5 705.5 L 976.5 705.5 Z M 922.5 685.5 L 942.5 685.5 L 942.5 705.5 L 922.5 705.5 Z M 867.5 685.5 L 887.5 685.5 L 887.5 705.5 L 867.5 705.5 Z M 813.5 685.5 L 833.5 685.5 L 833.5 705.5 L 813.5 705.5 Z M 758.5 685.5 L 778.5 685.5 L 778.5 705.5 L 758.5 705.5 Z M 704.5 685.5 L 724.5 685.5 L 724.5 705.5 L 704.5 705.5 Z M 649.5 685.5 L 669.5 685.5 L 669.5 705.5 L 649.5 705.5 Z M 595.5 685.5 L 615.5 685.5 L 615.5 705.5 L 595.5 705.5 Z M 540.5 685.5 L 561.5 685.5 L 561.5 705.5 L 540.5 705.5 Z M 486.5 685.5 L 506.5 685.5 L 506.5 705.5 L 486.5 705.5 Z M 432.5 685.5 L 452.5 685.5 L 452.5 705.5 L 432.5 705.5 Z M 377.5 685.5 L 397.5 685.5 L 397.5 705.5 L 377.5 705.5 Z M 323.5 685.5 L 343.5 685.5 L 343.5 705.5 L 323.5 705.5 Z M 268.5 685.5 L 288.5 685.5 L 288.5 705.5 L 268.5 705.5 Z M 268.5 685.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface383">
 <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 1544.3125 448.140625 L 1542.402344 450.5 L 1538.132812 446.960938 L 1536.910156 447.613281 L 1535.691406 448.101562 L 1534.429688 448.507812 L 1533.085938 448.792969 L 1531.746094 448.953125 L 1530.363281 449.035156 L 1528.492188 448.914062 L 1526.742188 448.628906 L 1525.117188 448.140625 L 1523.570312 447.488281 L 1522.105469 446.636719 L 1520.804688 445.539062 L 1519.625 444.359375 L 1518.609375 443.015625 L 1517.792969 441.550781 L 1517.101562 439.964844 L 1516.574219 438.257812 L 1516.25 436.386719 L 1516.167969 435.9375 L 1516.125 435.449219 L 1516.085938 435.003906 L 1516.046875 434.515625 L 1516.046875 433.5 L 1516.125 431.464844 L 1516.410156 429.511719 L 1516.859375 427.722656 L 1517.511719 426.015625 L 1518.324219 424.429688 L 1519.378906 422.964844 L 1520.4375 421.785156 L 1521.660156 420.726562 L 1523 419.832031 L 1524.425781 419.140625 L 1525.96875 418.570312 L 1527.679688 418.164062 L 1528.085938 418.125 L 1528.53125 418.082031 L 1528.980469 418.042969 L 1529.425781 418.003906 L 1529.875 418.003906 L 1530.363281 417.960938 L 1532.191406 418.082031 L 1533.941406 418.367188 L 1535.570312 418.855469 L 1537.113281 419.507812 L 1538.578125 420.359375 L 1539.921875 421.417969 L 1541.058594 422.640625 L 1542.078125 423.941406 L 1542.890625 425.363281 L 1543.582031 426.949219 L 1544.109375 428.660156 L 1544.476562 430.449219 L 1544.515625 430.976562 L 1544.558594 431.464844 L 1544.597656 431.953125 L 1544.640625 432.441406 L 1544.640625 432.929688 L 1544.679688 433.417969 L 1544.558594 435.695312 L 1544.191406 437.851562 L 1543.621094 439.84375 L 1542.808594 441.714844 L 1541.75 443.421875 L 1540.488281 445.007812 Z M 1534.0625 439.761719 L 1537.683594 442.730469 L 1538.660156 441.511719 L 1539.472656 440.128906 L 1540.082031 438.625 L 1540.53125 437.039062 L 1540.773438 435.328125 L 1540.898438 433.457031 L 1540.816406 431.75 L 1540.570312 430.121094 L 1540.164062 428.617188 L 1539.636719 427.234375 L 1538.945312 425.933594 L 1538.089844 424.753906 L 1537.113281 423.777344 L 1536.097656 422.964844 L 1534.957031 422.3125 L 1533.738281 421.824219 L 1532.394531 421.5 L 1531.011719 421.296875 L 1530.363281 421.296875 L 1528.898438 421.417969 L 1527.515625 421.664062 L 1526.214844 422.070312 L 1525.035156 422.679688 L 1523.9375 423.453125 L 1522.960938 424.386719 L 1522.023438 425.484375 L 1521.292969 426.707031 L 1520.683594 428.046875 L 1520.234375 429.511719 L 1519.949219 431.097656 L 1519.828125 432.808594 L 1519.828125 433.5 L 1519.867188 435.289062 L 1520.113281 436.914062 L 1520.519531 438.421875 L 1521.046875 439.84375 L 1521.78125 441.144531 L 1522.675781 442.285156 L 1523.609375 443.300781 L 1524.667969 444.113281 L 1525.808594 444.765625 L 1527.027344 445.210938 L 1528.371094 445.539062 L 1529.792969 445.660156 L 1529.875 445.699219 L 1531.054688 445.699219 L 1531.828125 445.621094 L 1532.597656 445.457031 L 1533.332031 445.292969 L 1534.0625 445.050781 L 1534.835938 444.722656 L 1534.878906 444.722656 L 1534.957031 444.683594 L 1535 444.644531 L 1535.082031 444.644531 L 1535.121094 444.601562 L 1535.203125 444.5625 L 1532.191406 442.039062 Z M 1534.0625 439.761719 "/>
 <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 1519 656 L 1539 656 M 1519 636 L 1539 636 M 1519 636 L 1519 656 M 1539 636 L 1539 656 " 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 1519 656 L 1539 656 M 1519 636 L 1539 636 M 1539 656 L 1539 636 M 1519 656 L 1519 636 " 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 197 379 L 197 388 M 192 384 L 201 384 M 196 385 L 198 385 M 196 383 L 198 383 M 196 383 L 196 385 M 198 383 L 198 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.svg b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.svg
index a66d5a0..6c88573 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.svg
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 356.5 L 1744.5 356.5 L 1744.5 540.5 L 174.5 540.5 Z M 174.5 356.5 "/>
 </clipPath>
-<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image536" 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="#image509"/>
+  <use xlink:href="#image536"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 213.5 680.5 L 233.5 680.5 L 233.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1660.5 588.5 L 1677.5 588.5 L 1677.5 662.5 L 1660.5 662.5 Z M 489.5 614.5 L 507.5 614.5 L 507.5 662.5 L 489.5 662.5 Z M 1605.5 614.5 L 1623.5 614.5 L 1623.5 662.5 L 1605.5 662.5 Z M 330.5 614.5 L 348.5 614.5 L 348.5 662.5 L 330.5 662.5 Z M 1390.5 614.5 L 1407.5 614.5 L 1407.5 662.5 L 1390.5 662.5 Z M 1327.5 614.5 L 1344.5 614.5 L 1344.5 662.5 L 1327.5 662.5 Z M 1254.5 614.5 L 1271.5 614.5 L 1271.5 662.5 L 1254.5 662.5 Z M 1212.5 614.5 L 1230.5 614.5 L 1230.5 662.5 L 1212.5 662.5 Z M 282.5 614.5 L 300.5 614.5 L 300.5 662.5 L 282.5 662.5 Z M 241.5 614.5 L 258.5 614.5 L 258.5 662.5 L 241.5 662.5 Z M 991.5 614.5 L 1008.5 614.5 L 1008.5 662.5 L 991.5 662.5 Z M 949.5 614.5 L 967.5 614.5 L 967.5 662.5 L 949.5 662.5 Z M 842.5 614.5 L 859.5 614.5 L 859.5 662.5 L 842.5 662.5 Z M 801.5 614.5 L 818.5 614.5 L 818.5 662.5 L 801.5 662.5 Z M 753.5 614.5 L 770.5 614.5 L 770.5 662.5 L 753.5 662.5 Z M 645.5 614.5 L 662.5 614.5 L 662.5 662.5 L 645.5 662.5 Z M 597.5 614.5 L 614.5 614.5 L 614.5 662.5 L 597.5 662.5 Z M 379.5 614.5 L 396.5 614.5 L 396.5 662.5 L 379.5 662.5 Z M 1045.5 589.5 L 1062.5 589.5 L 1062.5 662.5 L 1045.5 662.5 Z M 1142.5 589.5 L 1159.5 589.5 L 1159.5 662.5 L 1142.5 662.5 Z M 1498.5 588.5 L 1515.5 588.5 L 1515.5 662.5 L 1498.5 662.5 Z M 1498.5 588.5 "/>
 </clipPath>
-<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image537" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1390.5 405.5 L 1407.5 405.5 L 1407.5 453.5 L 1390.5 453.5 Z M 1282.5 405.5 L 1299.5 405.5 L 1299.5 453.5 L 1282.5 453.5 Z M 979.5 405.5 L 996.5 405.5 L 996.5 453.5 L 979.5 453.5 Z M 1208.5 405.5 L 1226.5 405.5 L 1226.5 453.5 L 1208.5 453.5 Z M 923.5 405.5 L 940.5 405.5 L 940.5 453.5 L 923.5 453.5 Z M 856.5 405.5 L 873.5 405.5 L 873.5 453.5 L 856.5 453.5 Z M 1158.5 405.5 L 1175.5 405.5 L 1175.5 453.5 L 1158.5 453.5 Z M 797.5 405.5 L 814.5 405.5 L 814.5 453.5 L 797.5 453.5 Z M 749.5 405.5 L 766.5 405.5 L 766.5 453.5 L 749.5 453.5 Z M 486.5 405.5 L 503.5 405.5 L 503.5 478.5 L 486.5 478.5 Z M 379.5 405.5 L 396.5 405.5 L 396.5 478.5 L 379.5 478.5 Z M 289.5 405.5 L 306.5 405.5 L 306.5 478.5 L 289.5 478.5 Z M 330.5 405.5 L 348.5 405.5 L 348.5 478.5 L 330.5 478.5 Z M 241.5 405.5 L 258.5 405.5 L 258.5 478.5 L 241.5 478.5 Z M 594.5 405.5 L 611.5 405.5 L 611.5 478.5 L 594.5 478.5 Z M 642.5 405.5 L 659.5 405.5 L 659.5 478.5 L 642.5 478.5 Z M 1605.5 413.5 L 1623.5 413.5 L 1623.5 486.5 L 1605.5 486.5 Z M 1045.5 405.5 L 1062.5 405.5 L 1062.5 501.5 L 1045.5 501.5 Z M 1087.5 405.5 L 1104.5 405.5 L 1104.5 501.5 L 1087.5 501.5 Z M 1498.5 405.5 L 1515.5 405.5 L 1515.5 519.5 L 1498.5 519.5 Z M 1660.5 405.5 L 1677.5 405.5 L 1677.5 519.5 L 1660.5 519.5 Z M 1660.5 405.5 "/>
 </clipPath>
-<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image538" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 1686.5 368.5 L 1705.5 368.5 L 1705.5 388.5 L 1686.5 388.5 Z M 1633.5 368.5 L 1653.5 368.5 L 1653.5 388.5 L 1633.5 388.5 Z M 1581.5 368.5 L 1600.5 368.5 L 1600.5 388.5 L 1581.5 388.5 Z M 1528.5 368.5 L 1548.5 368.5 L 1548.5 388.5 L 1528.5 388.5 Z M 1476.5 368.5 L 1495.5 368.5 L 1495.5 388.5 L 1476.5 388.5 Z M 1423.5 368.5 L 1442.5 368.5 L 1442.5 388.5 L 1423.5 388.5 Z M 1370.5 368.5 L 1390.5 368.5 L 1390.5 388.5 L 1370.5 388.5 Z M 1318.5 368.5 L 1337.5 368.5 L 1337.5 388.5 L 1318.5 388.5 Z M 1265.5 368.5 L 1285.5 368.5 L 1285.5 388.5 L 1265.5 388.5 Z M 1212.5 368.5 L 1232.5 368.5 L 1232.5 388.5 L 1212.5 388.5 Z M 1160.5 368.5 L 1179.5 368.5 L 1179.5 388.5 L 1160.5 388.5 Z M 1107.5 368.5 L 1127.5 368.5 L 1127.5 388.5 L 1107.5 388.5 Z M 1055.5 368.5 L 1074.5 368.5 L 1074.5 388.5 L 1055.5 388.5 Z M 1002.5 368.5 L 1021.5 368.5 L 1021.5 388.5 L 1002.5 388.5 Z M 949.5 368.5 L 969.5 368.5 L 969.5 388.5 L 949.5 388.5 Z M 897.5 368.5 L 916.5 368.5 L 916.5 388.5 L 897.5 388.5 Z M 844.5 368.5 L 864.5 368.5 L 864.5 388.5 L 844.5 388.5 Z M 791.5 368.5 L 811.5 368.5 L 811.5 388.5 L 791.5 388.5 Z M 739.5 368.5 L 758.5 368.5 L 758.5 388.5 L 739.5 388.5 Z M 686.5 368.5 L 706.5 368.5 L 706.5 388.5 L 686.5 388.5 Z M 634.5 368.5 L 653.5 368.5 L 653.5 388.5 L 634.5 388.5 Z M 581.5 368.5 L 600.5 368.5 L 600.5 388.5 L 581.5 388.5 Z M 528.5 368.5 L 548.5 368.5 L 548.5 388.5 L 528.5 388.5 Z M 476.5 368.5 L 495.5 368.5 L 495.5 388.5 L 476.5 388.5 Z M 423.5 368.5 L 443.5 368.5 L 443.5 388.5 L 423.5 388.5 Z M 371.5 368.5 L 390.5 368.5 L 390.5 388.5 L 371.5 388.5 Z M 318.5 368.5 L 337.5 368.5 L 337.5 388.5 L 318.5 388.5 Z M 265.5 368.5 L 285.5 368.5 L 285.5 388.5 L 265.5 388.5 Z M 791.5 466.5 L 811.5 466.5 L 811.5 481.5 L 791.5 481.5 Z M 791.5 481.5 L 811.5 481.5 L 811.5 485.5 L 791.5 485.5 Z M 1055.5 466.5 L 1074.5 466.5 L 1074.5 485.5 L 1055.5 485.5 Z M 634.5 466.5 L 653.5 466.5 L 653.5 485.5 L 634.5 485.5 Z M 956.5 505.5 L 975.5 505.5 L 975.5 507.5 L 956.5 507.5 Z M 371.5 505.5 L 390.5 505.5 L 390.5 524.5 L 371.5 524.5 Z M 739.5 505.5 L 758.5 505.5 L 758.5 524.5 L 739.5 524.5 Z M 1212.5 505.5 L 1232.5 505.5 L 1232.5 524.5 L 1212.5 524.5 Z M 956.5 507.5 L 975.5 507.5 L 975.5 524.5 L 956.5 524.5 Z M 476.5 543.5 L 495.5 543.5 L 495.5 547.5 L 476.5 547.5 Z M 686.5 543.5 L 706.5 543.5 L 706.5 555.5 L 686.5 555.5 Z M 266.5 543.5 L 285.5 543.5 L 285.5 556.5 L 266.5 556.5 Z M 1160.5 543.5 L 1179.5 543.5 L 1179.5 563.5 L 1160.5 563.5 Z M 476.5 547.5 L 495.5 547.5 L 495.5 563.5 L 476.5 563.5 Z M 686.5 555.5 L 706.5 555.5 L 706.5 563.5 L 686.5 563.5 Z M 266.5 556.5 L 285.5 556.5 L 285.5 563.5 L 266.5 563.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 1686.5 680.5 L 1705.5 680.5 L 1705.5 699.5 L 1686.5 699.5 Z M 1633.5 680.5 L 1653.5 680.5 L 1653.5 699.5 L 1633.5 699.5 Z M 1581.5 680.5 L 1600.5 680.5 L 1600.5 699.5 L 1581.5 699.5 Z M 1528.5 680.5 L 1548.5 680.5 L 1548.5 699.5 L 1528.5 699.5 Z M 1476.5 680.5 L 1495.5 680.5 L 1495.5 699.5 L 1476.5 699.5 Z M 1423.5 680.5 L 1442.5 680.5 L 1442.5 699.5 L 1423.5 699.5 Z M 1370.5 680.5 L 1390.5 680.5 L 1390.5 699.5 L 1370.5 699.5 Z M 1318.5 680.5 L 1337.5 680.5 L 1337.5 699.5 L 1318.5 699.5 Z M 1265.5 680.5 L 1285.5 680.5 L 1285.5 699.5 L 1265.5 699.5 Z M 1212.5 680.5 L 1232.5 680.5 L 1232.5 699.5 L 1212.5 699.5 Z M 1160.5 680.5 L 1179.5 680.5 L 1179.5 699.5 L 1160.5 699.5 Z M 1107.5 680.5 L 1127.5 680.5 L 1127.5 699.5 L 1107.5 699.5 Z M 1055.5 680.5 L 1074.5 680.5 L 1074.5 699.5 L 1055.5 699.5 Z M 1002.5 680.5 L 1021.5 680.5 L 1021.5 699.5 L 1002.5 699.5 Z M 949.5 680.5 L 969.5 680.5 L 969.5 699.5 L 949.5 699.5 Z M 897.5 680.5 L 916.5 680.5 L 916.5 699.5 L 897.5 699.5 Z M 844.5 680.5 L 864.5 680.5 L 864.5 699.5 L 844.5 699.5 Z M 791.5 680.5 L 811.5 680.5 L 811.5 699.5 L 791.5 699.5 Z M 739.5 680.5 L 758.5 680.5 L 758.5 699.5 L 739.5 699.5 Z M 686.5 680.5 L 706.5 680.5 L 706.5 699.5 L 686.5 699.5 Z M 634.5 680.5 L 653.5 680.5 L 653.5 699.5 L 634.5 699.5 Z M 581.5 680.5 L 600.5 680.5 L 600.5 699.5 L 581.5 699.5 Z M 528.5 680.5 L 548.5 680.5 L 548.5 699.5 L 528.5 699.5 Z M 476.5 680.5 L 495.5 680.5 L 495.5 699.5 L 476.5 699.5 Z M 423.5 680.5 L 443.5 680.5 L 443.5 699.5 L 423.5 699.5 Z M 371.5 680.5 L 390.5 680.5 L 390.5 699.5 L 371.5 699.5 Z M 318.5 680.5 L 337.5 680.5 L 337.5 699.5 L 318.5 699.5 Z M 265.5 680.5 L 285.5 680.5 L 285.5 699.5 L 265.5 699.5 Z M 265.5 680.5 "/>
 </clipPath>
-<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image539" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image512"/>
+  <use xlink:href="#image539"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface506">
+<g id="surface533">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -260,6 +260,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 929.839844 520.386719 L 928.191406 520.386719 L 928.070312 519.894531 L 927.914062 519.445312 L 927.699219 519.050781 L 927.425781 518.738281 L 927.089844 518.5 L 926.71875 518.304688 L 926.558594 518.265625 L 926.402344 518.226562 L 926.246094 518.207031 L 926.089844 518.167969 L 925.914062 518.167969 L 925.753906 518.148438 L 925.246094 518.207031 L 924.792969 518.324219 L 924.378906 518.519531 L 924.007812 518.816406 L 923.695312 519.1875 L 923.4375 519.621094 L 923.261719 519.992188 L 923.144531 520.386719 L 923.027344 520.796875 L 922.96875 521.269531 L 922.90625 521.742188 L 922.90625 522.25 L 922.929688 522.996094 L 923.027344 523.644531 L 923.203125 524.234375 L 923.417969 524.746094 L 923.714844 525.195312 L 924.085938 525.570312 L 924.320312 525.765625 L 924.578125 525.902344 L 924.851562 526.023438 L 925.148438 526.101562 L 925.460938 526.160156 L 925.792969 526.160156 L 926.441406 526.101562 L 926.992188 525.882812 L 927.464844 525.550781 L 927.835938 525.058594 L 928.113281 524.449219 L 928.308594 523.683594 L 929.957031 523.683594 L 929.859375 524.429688 L 929.683594 525.078125 L 929.425781 525.667969 L 929.09375 526.179688 L 928.679688 526.628906 L 928.210938 527.003906 L 927.855469 527.21875 L 927.484375 527.375 L 927.089844 527.496094 L 926.660156 527.59375 L 926.207031 527.652344 L 925.753906 527.671875 L 925.066406 527.613281 L 924.441406 527.496094 L 923.851562 527.277344 L 923.320312 527.003906 L 922.828125 526.628906 L 922.398438 526.160156 L 922.023438 525.667969 L 921.710938 525.097656 L 921.496094 524.46875 L 921.316406 523.785156 L 921.21875 523.058594 L 921.199219 522.25 L 921.21875 521.40625 L 921.335938 520.621094 L 921.535156 519.894531 L 921.789062 519.226562 L 922.121094 518.621094 L 922.535156 518.070312 L 922.96875 517.636719 L 923.4375 517.285156 L 923.949219 517.007812 L 924.519531 516.8125 L 925.125 516.695312 L 925.773438 516.636719 L 926.5 516.695312 L 927.167969 516.8125 L 927.777344 517.046875 L 928.308594 517.34375 L 928.757812 517.753906 L 929.152344 518.226562 L 929.328125 518.539062 L 929.484375 518.855469 L 929.605469 519.207031 L 929.722656 519.582031 L 929.78125 519.972656 Z M 929.839844 520.386719 "/>
 <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 933.175781 512.90625 L 933.175781 521.289062 L 937.535156 516.929688 L 939.636719 516.929688 L 936.0625 520.484375 L 940.265625 527.21875 L 938.242188 527.21875 L 934.769531 521.644531 L 933.175781 523.214844 L 933.175781 527.21875 L 931.546875 527.21875 L 931.546875 512.90625 Z M 933.175781 512.90625 "/>
 <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 1393 514 L 1393 521 M 1389 518 L 1396 518 M 196 387 L 196 392 M 193 390 L 198 390 M 862 556 L 862 563 M 858 560 L 865 560 " 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 196 385 L 196 394 M 191 390 L 200 390 M 195 391 L 197 391 M 195 389 L 197 389 M 195 389 L 195 391 M 197 389 L 197 391 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.svg b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.svg
index bb9438f..5eef033 100644
--- a/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.svg
+++ b/cells/sdfsbp/sky130_fd_sc_hd__sdfsbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 367.5 L 1743.5 367.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 367.5 "/>
 </clipPath>
-<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image538" 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="#image510"/>
+  <use xlink:href="#image538"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 210.5 670.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image510"/>
+  <use xlink:href="#image538"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1613.5 585.5 L 1630.5 585.5 L 1630.5 654.5 L 1613.5 654.5 Z M 571.5 609.5 L 588.5 609.5 L 588.5 654.5 L 571.5 654.5 Z M 471.5 609.5 L 487.5 609.5 L 487.5 654.5 L 471.5 654.5 Z M 1563.5 609.5 L 1579.5 609.5 L 1579.5 654.5 L 1563.5 654.5 Z M 320.5 609.5 L 336.5 609.5 L 336.5 654.5 L 320.5 654.5 Z M 275.5 609.5 L 291.5 609.5 L 291.5 654.5 L 275.5 654.5 Z M 1294.5 609.5 L 1310.5 609.5 L 1310.5 654.5 L 1294.5 654.5 Z M 1242.5 609.5 L 1258.5 609.5 L 1258.5 654.5 L 1242.5 654.5 Z M 1188.5 609.5 L 1204.5 609.5 L 1204.5 654.5 L 1188.5 654.5 Z M 1150.5 609.5 L 1166.5 609.5 L 1166.5 654.5 L 1150.5 654.5 Z M 236.5 609.5 L 253.5 609.5 L 253.5 654.5 L 236.5 654.5 Z M 617.5 609.5 L 633.5 609.5 L 633.5 654.5 L 617.5 654.5 Z M 940.5 609.5 L 956.5 609.5 L 956.5 654.5 L 940.5 654.5 Z M 902.5 609.5 L 918.5 609.5 L 918.5 654.5 L 902.5 654.5 Z M 801.5 609.5 L 817.5 609.5 L 817.5 654.5 L 801.5 654.5 Z M 762.5 609.5 L 778.5 609.5 L 778.5 654.5 L 762.5 654.5 Z M 717.5 609.5 L 733.5 609.5 L 733.5 654.5 L 717.5 654.5 Z M 370.5 609.5 L 386.5 609.5 L 386.5 654.5 L 370.5 654.5 Z M 991.5 586.5 L 1007.5 586.5 L 1007.5 654.5 L 991.5 654.5 Z M 1085.5 586.5 L 1102.5 586.5 L 1102.5 654.5 L 1085.5 654.5 Z M 1658.5 585.5 L 1675.5 585.5 L 1675.5 654.5 L 1658.5 654.5 Z M 1455.5 585.5 L 1471.5 585.5 L 1471.5 654.5 L 1455.5 654.5 Z M 1410.5 585.5 L 1426.5 585.5 L 1426.5 654.5 L 1410.5 654.5 Z M 1410.5 585.5 "/>
 </clipPath>
-<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image539" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image511"/>
+  <use xlink:href="#image539"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1309.5 413.5 L 1325.5 413.5 L 1325.5 458.5 L 1309.5 458.5 Z M 1102.5 413.5 L 1118.5 413.5 L 1118.5 458.5 L 1102.5 458.5 Z M 933.5 413.5 L 949.5 413.5 L 949.5 458.5 L 933.5 458.5 Z M 1208.5 413.5 L 1224.5 413.5 L 1224.5 458.5 L 1208.5 458.5 Z M 881.5 413.5 L 897.5 413.5 L 897.5 458.5 L 881.5 458.5 Z M 817.5 413.5 L 833.5 413.5 L 833.5 458.5 L 817.5 458.5 Z M 1149.5 413.5 L 1165.5 413.5 L 1165.5 458.5 L 1149.5 458.5 Z M 769.5 413.5 L 785.5 413.5 L 785.5 458.5 L 769.5 458.5 Z M 718.5 413.5 L 734.5 413.5 L 734.5 458.5 L 718.5 458.5 Z M 617.5 413.5 L 633.5 413.5 L 633.5 482.5 L 617.5 482.5 Z M 572.5 413.5 L 588.5 413.5 L 588.5 482.5 L 572.5 482.5 Z M 471.5 413.5 L 487.5 413.5 L 487.5 482.5 L 471.5 482.5 Z M 320.5 413.5 L 336.5 413.5 L 336.5 482.5 L 320.5 482.5 Z M 282.5 413.5 L 298.5 413.5 L 298.5 482.5 L 282.5 482.5 Z M 236.5 413.5 L 253.5 413.5 L 253.5 482.5 L 236.5 482.5 Z M 372.5 413.5 L 388.5 413.5 L 388.5 482.5 L 372.5 482.5 Z M 1563.5 420.5 L 1579.5 420.5 L 1579.5 489.5 L 1563.5 489.5 Z M 995.5 413.5 L 1012.5 413.5 L 1012.5 503.5 L 995.5 503.5 Z M 1034.5 413.5 L 1050.5 413.5 L 1050.5 503.5 L 1034.5 503.5 Z M 1455.5 413.5 L 1471.5 413.5 L 1471.5 520.5 L 1455.5 520.5 Z M 1613.5 413.5 L 1630.5 413.5 L 1630.5 520.5 L 1613.5 520.5 Z M 1658.5 413.5 L 1675.5 413.5 L 1675.5 520.5 L 1658.5 520.5 Z M 1410.5 413.5 L 1426.5 413.5 L 1426.5 520.5 L 1410.5 520.5 Z M 1410.5 413.5 "/>
 </clipPath>
-<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image540" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image512"/>
+  <use xlink:href="#image540"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 210.5 379.5 L 228.5 379.5 L 228.5 397.5 L 210.5 397.5 Z M 1689.5 379.5 L 1707.5 379.5 L 1707.5 397.5 L 1689.5 397.5 Z M 1640.5 379.5 L 1658.5 379.5 L 1658.5 397.5 L 1640.5 397.5 Z M 1590.5 379.5 L 1609.5 379.5 L 1609.5 397.5 L 1590.5 397.5 Z M 1541.5 379.5 L 1559.5 379.5 L 1559.5 397.5 L 1541.5 397.5 Z M 1492.5 379.5 L 1510.5 379.5 L 1510.5 397.5 L 1492.5 397.5 Z M 1442.5 379.5 L 1461.5 379.5 L 1461.5 397.5 L 1442.5 397.5 Z M 1393.5 379.5 L 1411.5 379.5 L 1411.5 397.5 L 1393.5 397.5 Z M 1344.5 379.5 L 1362.5 379.5 L 1362.5 397.5 L 1344.5 397.5 Z M 1295.5 379.5 L 1313.5 379.5 L 1313.5 397.5 L 1295.5 397.5 Z M 1245.5 379.5 L 1263.5 379.5 L 1263.5 397.5 L 1245.5 397.5 Z M 1196.5 379.5 L 1214.5 379.5 L 1214.5 397.5 L 1196.5 397.5 Z M 1147.5 379.5 L 1165.5 379.5 L 1165.5 397.5 L 1147.5 397.5 Z M 1097.5 379.5 L 1116.5 379.5 L 1116.5 397.5 L 1097.5 397.5 Z M 1048.5 379.5 L 1066.5 379.5 L 1066.5 397.5 L 1048.5 397.5 Z M 999.5 379.5 L 1017.5 379.5 L 1017.5 397.5 L 999.5 397.5 Z M 949.5 379.5 L 968.5 379.5 L 968.5 397.5 L 949.5 397.5 Z M 900.5 379.5 L 918.5 379.5 L 918.5 397.5 L 900.5 397.5 Z M 851.5 379.5 L 869.5 379.5 L 869.5 397.5 L 851.5 397.5 Z M 801.5 379.5 L 820.5 379.5 L 820.5 397.5 L 801.5 397.5 Z M 752.5 379.5 L 770.5 379.5 L 770.5 397.5 L 752.5 397.5 Z M 703.5 379.5 L 721.5 379.5 L 721.5 397.5 L 703.5 397.5 Z M 653.5 379.5 L 672.5 379.5 L 672.5 397.5 L 653.5 397.5 Z M 604.5 379.5 L 622.5 379.5 L 622.5 397.5 L 604.5 397.5 Z M 555.5 379.5 L 573.5 379.5 L 573.5 397.5 L 555.5 397.5 Z M 506.5 379.5 L 524.5 379.5 L 524.5 397.5 L 506.5 397.5 Z M 456.5 379.5 L 474.5 379.5 L 474.5 397.5 L 456.5 397.5 Z M 407.5 379.5 L 425.5 379.5 L 425.5 397.5 L 407.5 397.5 Z M 358.5 379.5 L 376.5 379.5 L 376.5 397.5 L 358.5 397.5 Z M 308.5 379.5 L 327.5 379.5 L 327.5 397.5 L 308.5 397.5 Z M 259.5 379.5 L 277.5 379.5 L 277.5 397.5 L 259.5 397.5 Z M 758.5 470.5 L 776.5 470.5 L 776.5 484.5 L 758.5 484.5 Z M 758.5 484.5 L 776.5 484.5 L 776.5 488.5 L 758.5 488.5 Z M 1005.5 470.5 L 1023.5 470.5 L 1023.5 488.5 L 1005.5 488.5 Z M 604.5 470.5 L 622.5 470.5 L 622.5 488.5 L 604.5 488.5 Z M 358.5 506.5 L 376.5 506.5 L 376.5 524.5 L 358.5 524.5 Z M 709.5 506.5 L 727.5 506.5 L 727.5 524.5 L 709.5 524.5 Z M 906.5 506.5 L 924.5 506.5 L 924.5 524.5 L 906.5 524.5 Z M 1152.5 506.5 L 1171.5 506.5 L 1171.5 524.5 L 1152.5 524.5 Z M 456.5 543.5 L 474.5 543.5 L 474.5 546.5 L 456.5 546.5 Z M 653.5 543.5 L 672.5 543.5 L 672.5 554.5 L 653.5 554.5 Z M 259.5 543.5 L 277.5 543.5 L 277.5 555.5 L 259.5 555.5 Z M 653.5 554.5 L 672.5 554.5 L 672.5 561.5 L 653.5 561.5 Z M 456.5 546.5 L 474.5 546.5 L 474.5 561.5 L 456.5 561.5 Z M 1103.5 543.5 L 1121.5 543.5 L 1121.5 561.5 L 1103.5 561.5 Z M 259.5 555.5 L 277.5 555.5 L 277.5 561.5 L 259.5 561.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 1689.5 670.5 L 1707.5 670.5 L 1707.5 689.5 L 1689.5 689.5 Z M 1640.5 670.5 L 1658.5 670.5 L 1658.5 689.5 L 1640.5 689.5 Z M 1590.5 670.5 L 1609.5 670.5 L 1609.5 689.5 L 1590.5 689.5 Z M 1541.5 670.5 L 1559.5 670.5 L 1559.5 689.5 L 1541.5 689.5 Z M 1492.5 670.5 L 1510.5 670.5 L 1510.5 689.5 L 1492.5 689.5 Z M 1442.5 670.5 L 1461.5 670.5 L 1461.5 689.5 L 1442.5 689.5 Z M 1393.5 670.5 L 1411.5 670.5 L 1411.5 689.5 L 1393.5 689.5 Z M 1344.5 670.5 L 1362.5 670.5 L 1362.5 689.5 L 1344.5 689.5 Z M 1295.5 670.5 L 1313.5 670.5 L 1313.5 689.5 L 1295.5 689.5 Z M 1245.5 670.5 L 1263.5 670.5 L 1263.5 689.5 L 1245.5 689.5 Z M 1196.5 670.5 L 1214.5 670.5 L 1214.5 689.5 L 1196.5 689.5 Z M 1147.5 670.5 L 1165.5 670.5 L 1165.5 689.5 L 1147.5 689.5 Z M 1097.5 670.5 L 1116.5 670.5 L 1116.5 689.5 L 1097.5 689.5 Z M 1048.5 670.5 L 1066.5 670.5 L 1066.5 689.5 L 1048.5 689.5 Z M 999.5 670.5 L 1017.5 670.5 L 1017.5 689.5 L 999.5 689.5 Z M 949.5 670.5 L 968.5 670.5 L 968.5 689.5 L 949.5 689.5 Z M 900.5 670.5 L 918.5 670.5 L 918.5 689.5 L 900.5 689.5 Z M 851.5 670.5 L 869.5 670.5 L 869.5 689.5 L 851.5 689.5 Z M 801.5 670.5 L 820.5 670.5 L 820.5 689.5 L 801.5 689.5 Z M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 703.5 670.5 L 721.5 670.5 L 721.5 689.5 L 703.5 689.5 Z M 653.5 670.5 L 672.5 670.5 L 672.5 689.5 L 653.5 689.5 Z M 604.5 670.5 L 622.5 670.5 L 622.5 689.5 L 604.5 689.5 Z M 555.5 670.5 L 573.5 670.5 L 573.5 689.5 L 555.5 689.5 Z M 506.5 670.5 L 524.5 670.5 L 524.5 689.5 L 506.5 689.5 Z M 456.5 670.5 L 474.5 670.5 L 474.5 689.5 L 456.5 689.5 Z M 407.5 670.5 L 425.5 670.5 L 425.5 689.5 L 407.5 689.5 Z M 358.5 670.5 L 376.5 670.5 L 376.5 689.5 L 358.5 689.5 Z M 308.5 670.5 L 327.5 670.5 L 327.5 689.5 L 308.5 689.5 Z M 259.5 670.5 L 277.5 670.5 L 277.5 689.5 L 259.5 689.5 Z M 259.5 670.5 "/>
 </clipPath>
-<image id="image513" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image541" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image513"/>
+  <use xlink:href="#image541"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface507">
+<g id="surface535">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -260,6 +260,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 883.53125 525.179688 L 881.996094 525.179688 L 881.886719 524.722656 L 881.742188 524.304688 L 881.542969 523.941406 L 881.285156 523.648438 L 880.976562 523.429688 L 880.628906 523.246094 L 880.339844 523.175781 L 880.191406 523.15625 L 880.046875 523.121094 L 879.882812 523.121094 L 879.738281 523.101562 L 879.261719 523.15625 L 878.84375 523.265625 L 878.460938 523.449219 L 878.113281 523.722656 L 877.824219 524.066406 L 877.585938 524.46875 L 877.421875 524.816406 L 877.3125 525.179688 L 877.203125 525.5625 L 877.09375 526.4375 L 877.09375 526.914062 L 877.113281 527.605469 L 877.203125 528.207031 L 877.367188 528.753906 L 877.566406 529.226562 L 877.839844 529.648438 L 878.1875 529.992188 L 878.40625 530.175781 L 878.644531 530.304688 L 878.898438 530.414062 L 879.171875 530.484375 L 879.464844 530.539062 L 879.773438 530.539062 L 880.375 530.484375 L 880.886719 530.285156 L 881.324219 529.976562 L 881.667969 529.519531 L 881.925781 528.953125 L 882.105469 528.242188 L 883.640625 528.242188 L 883.546875 528.9375 L 883.382812 529.539062 L 883.148438 530.085938 L 882.835938 530.558594 L 882.453125 530.976562 L 882.015625 531.324219 L 881.6875 531.523438 L 881.339844 531.671875 L 880.976562 531.78125 L 880.574219 531.871094 L 880.15625 531.925781 L 879.738281 531.945312 L 879.097656 531.890625 L 878.515625 531.78125 L 877.96875 531.578125 L 877.476562 531.324219 L 877.019531 530.976562 L 876.621094 530.539062 L 876.273438 530.085938 L 875.980469 529.554688 L 875.78125 528.972656 L 875.617188 528.335938 L 875.523438 527.660156 L 875.507812 526.914062 L 875.523438 526.128906 L 875.632812 525.398438 L 875.816406 524.722656 L 876.054688 524.105469 L 876.363281 523.539062 L 876.746094 523.027344 L 877.148438 522.628906 L 877.585938 522.300781 L 878.058594 522.042969 L 878.589844 521.863281 L 879.152344 521.753906 L 879.753906 521.699219 L 880.429688 521.753906 L 881.050781 521.863281 L 881.613281 522.082031 L 882.105469 522.355469 L 882.527344 522.738281 L 882.890625 523.175781 L 883.054688 523.464844 L 883.203125 523.757812 L 883.3125 524.085938 L 883.421875 524.433594 L 883.476562 524.796875 Z M 883.53125 525.179688 "/>
 <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 886.628906 518.234375 L 886.628906 526.019531 L 890.675781 521.972656 L 892.628906 521.972656 L 889.308594 525.269531 L 893.210938 531.523438 L 891.332031 531.523438 L 888.105469 526.347656 L 886.628906 527.804688 L 886.628906 531.523438 L 885.117188 531.523438 L 885.117188 518.234375 Z M 886.628906 518.234375 "/>
 <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 194 397 L 194 402 M 191 400 L 196 400 M 1317 518 L 1317 525 M 1313 522 L 1320 522 M 821 551 L 821 558 M 817 555 L 824 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(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 395 L 194 404 M 189 400 L 198 400 M 193 401 L 195 401 M 193 399 L 195 399 M 193 399 L 193 401 M 195 399 L 195 401 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.svg b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.svg
index 0a11940..7d1d8a2 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.svg
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 344.5 L 1744.5 344.5 L 1744.5 541.5 L 175.5 541.5 Z M 175.5 344.5 "/>
 </clipPath>
-<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image481" 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="#image455"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 216.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image455"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1654.5 592.5 L 1672.5 592.5 L 1672.5 672.5 L 1654.5 672.5 Z M 512.5 620.5 L 531.5 620.5 L 531.5 672.5 L 512.5 672.5 Z M 1595.5 620.5 L 1613.5 620.5 L 1613.5 672.5 L 1595.5 672.5 Z M 1465.5 620.5 L 1483.5 620.5 L 1483.5 672.5 L 1465.5 672.5 Z M 1395.5 620.5 L 1413.5 620.5 L 1413.5 672.5 L 1395.5 672.5 Z M 1336.5 620.5 L 1355.5 620.5 L 1355.5 672.5 L 1336.5 672.5 Z M 1292.5 620.5 L 1310.5 620.5 L 1310.5 672.5 L 1292.5 672.5 Z M 342.5 620.5 L 360.5 620.5 L 360.5 672.5 L 342.5 672.5 Z M 290.5 620.5 L 309.5 620.5 L 309.5 672.5 L 290.5 672.5 Z M 1049.5 620.5 L 1068.5 620.5 L 1068.5 672.5 L 1049.5 672.5 Z M 1005.5 620.5 L 1024.5 620.5 L 1024.5 672.5 L 1005.5 672.5 Z M 890.5 620.5 L 908.5 620.5 L 908.5 672.5 L 890.5 672.5 Z M 846.5 620.5 L 864.5 620.5 L 864.5 672.5 L 846.5 672.5 Z M 794.5 620.5 L 813.5 620.5 L 813.5 672.5 L 794.5 672.5 Z M 679.5 620.5 L 697.5 620.5 L 697.5 672.5 L 679.5 672.5 Z M 628.5 620.5 L 646.5 620.5 L 646.5 672.5 L 628.5 672.5 Z M 246.5 620.5 L 265.5 620.5 L 265.5 672.5 L 246.5 672.5 Z M 393.5 620.5 L 412.5 620.5 L 412.5 672.5 L 393.5 672.5 Z M 1217.5 593.5 L 1236.5 593.5 L 1236.5 672.5 L 1217.5 672.5 Z M 1107.5 593.5 L 1126.5 593.5 L 1126.5 672.5 L 1107.5 672.5 Z M 1107.5 593.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1480.5 396.5 L 1498.5 396.5 L 1498.5 447.5 L 1480.5 447.5 Z M 1290.5 396.5 L 1308.5 396.5 L 1308.5 447.5 L 1290.5 447.5 Z M 1043.5 396.5 L 1062.5 396.5 L 1062.5 447.5 L 1043.5 447.5 Z M 983.5 396.5 L 1001.5 396.5 L 1001.5 447.5 L 983.5 447.5 Z M 1236.5 396.5 L 1254.5 396.5 L 1254.5 447.5 L 1236.5 447.5 Z M 905.5 396.5 L 923.5 396.5 L 923.5 447.5 L 905.5 447.5 Z M 842.5 396.5 L 860.5 396.5 L 860.5 447.5 L 842.5 447.5 Z M 1364.5 396.5 L 1383.5 396.5 L 1383.5 447.5 L 1364.5 447.5 Z M 791.5 396.5 L 809.5 396.5 L 809.5 447.5 L 791.5 447.5 Z M 509.5 396.5 L 527.5 396.5 L 527.5 474.5 L 509.5 474.5 Z M 246.5 396.5 L 265.5 396.5 L 265.5 474.5 L 246.5 474.5 Z M 393.5 396.5 L 412.5 396.5 L 412.5 474.5 L 393.5 474.5 Z M 298.5 396.5 L 316.5 396.5 L 316.5 474.5 L 298.5 474.5 Z M 342.5 396.5 L 360.5 396.5 L 360.5 474.5 L 342.5 474.5 Z M 624.5 396.5 L 642.5 396.5 L 642.5 474.5 L 624.5 474.5 Z M 675.5 396.5 L 694.5 396.5 L 694.5 474.5 L 675.5 474.5 Z M 1595.5 401.5 L 1613.5 401.5 L 1613.5 480.5 L 1595.5 480.5 Z M 1158.5 396.5 L 1177.5 396.5 L 1177.5 499.5 L 1158.5 499.5 Z M 1114.5 396.5 L 1133.5 396.5 L 1133.5 499.5 L 1114.5 499.5 Z M 1654.5 396.5 L 1672.5 396.5 L 1672.5 519.5 L 1654.5 519.5 Z M 1654.5 396.5 "/>
 </clipPath>
-<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image483"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 357.5 L 236.5 357.5 L 236.5 378.5 L 216.5 378.5 Z M 1682.5 357.5 L 1703.5 357.5 L 1703.5 378.5 L 1682.5 378.5 Z M 1625.5 357.5 L 1646.5 357.5 L 1646.5 378.5 L 1625.5 378.5 Z M 1569.5 357.5 L 1590.5 357.5 L 1590.5 378.5 L 1569.5 378.5 Z M 1513.5 357.5 L 1534.5 357.5 L 1534.5 378.5 L 1513.5 378.5 Z M 1456.5 357.5 L 1477.5 357.5 L 1477.5 378.5 L 1456.5 378.5 Z M 1400.5 357.5 L 1421.5 357.5 L 1421.5 378.5 L 1400.5 378.5 Z M 1343.5 357.5 L 1364.5 357.5 L 1364.5 378.5 L 1343.5 378.5 Z M 1287.5 357.5 L 1308.5 357.5 L 1308.5 378.5 L 1287.5 378.5 Z M 1231.5 357.5 L 1252.5 357.5 L 1252.5 378.5 L 1231.5 378.5 Z M 1174.5 357.5 L 1195.5 357.5 L 1195.5 378.5 L 1174.5 378.5 Z M 1118.5 357.5 L 1139.5 357.5 L 1139.5 378.5 L 1118.5 378.5 Z M 1062.5 357.5 L 1082.5 357.5 L 1082.5 378.5 L 1062.5 378.5 Z M 1005.5 357.5 L 1026.5 357.5 L 1026.5 378.5 L 1005.5 378.5 Z M 949.5 357.5 L 970.5 357.5 L 970.5 378.5 L 949.5 378.5 Z M 892.5 357.5 L 913.5 357.5 L 913.5 378.5 L 892.5 378.5 Z M 836.5 357.5 L 857.5 357.5 L 857.5 378.5 L 836.5 378.5 Z M 780.5 357.5 L 800.5 357.5 L 800.5 378.5 L 780.5 378.5 Z M 723.5 357.5 L 744.5 357.5 L 744.5 378.5 L 723.5 378.5 Z M 667.5 357.5 L 688.5 357.5 L 688.5 378.5 L 667.5 378.5 Z M 610.5 357.5 L 631.5 357.5 L 631.5 378.5 L 610.5 378.5 Z M 554.5 357.5 L 575.5 357.5 L 575.5 378.5 L 554.5 378.5 Z M 498.5 357.5 L 518.5 357.5 L 518.5 378.5 L 498.5 378.5 Z M 441.5 357.5 L 462.5 357.5 L 462.5 378.5 L 441.5 378.5 Z M 385.5 357.5 L 406.5 357.5 L 406.5 378.5 L 385.5 378.5 Z M 328.5 357.5 L 349.5 357.5 L 349.5 378.5 L 328.5 378.5 Z M 272.5 357.5 L 293.5 357.5 L 293.5 378.5 L 272.5 378.5 Z M 836.5 461.5 L 857.5 461.5 L 857.5 477.5 L 836.5 477.5 Z M 836.5 477.5 L 857.5 477.5 L 857.5 482.5 L 836.5 482.5 Z M 667.5 461.5 L 688.5 461.5 L 688.5 482.5 L 667.5 482.5 Z M 1125.5 461.5 L 1145.5 461.5 L 1145.5 482.5 L 1125.5 482.5 Z M 1012.5 503.5 L 1033.5 503.5 L 1033.5 523.5 L 1012.5 523.5 Z M 385.5 503.5 L 406.5 503.5 L 406.5 523.5 L 385.5 523.5 Z M 1294.5 503.5 L 1315.5 503.5 L 1315.5 523.5 L 1294.5 523.5 Z M 780.5 503.5 L 800.5 503.5 L 800.5 523.5 L 780.5 523.5 Z M 498.5 544.5 L 518.5 544.5 L 518.5 548.5 L 498.5 548.5 Z M 723.5 544.5 L 744.5 544.5 L 744.5 557.5 L 723.5 557.5 Z M 272.5 544.5 L 293.5 544.5 L 293.5 558.5 L 272.5 558.5 Z M 498.5 548.5 L 518.5 548.5 L 518.5 565.5 L 498.5 565.5 Z M 1237.5 544.5 L 1258.5 544.5 L 1258.5 565.5 L 1237.5 565.5 Z M 272.5 558.5 L 293.5 558.5 L 293.5 565.5 L 272.5 565.5 Z M 723.5 557.5 L 744.5 557.5 L 744.5 565.5 L 723.5 565.5 Z M 216.5 690.5 L 236.5 690.5 L 236.5 711.5 L 216.5 711.5 Z M 1682.5 690.5 L 1703.5 690.5 L 1703.5 711.5 L 1682.5 711.5 Z M 1625.5 690.5 L 1646.5 690.5 L 1646.5 711.5 L 1625.5 711.5 Z M 1569.5 690.5 L 1590.5 690.5 L 1590.5 711.5 L 1569.5 711.5 Z M 1513.5 690.5 L 1534.5 690.5 L 1534.5 711.5 L 1513.5 711.5 Z M 1456.5 690.5 L 1477.5 690.5 L 1477.5 711.5 L 1456.5 711.5 Z M 1400.5 690.5 L 1421.5 690.5 L 1421.5 711.5 L 1400.5 711.5 Z M 1343.5 690.5 L 1364.5 690.5 L 1364.5 711.5 L 1343.5 711.5 Z M 1287.5 690.5 L 1308.5 690.5 L 1308.5 711.5 L 1287.5 711.5 Z M 1231.5 690.5 L 1252.5 690.5 L 1252.5 711.5 L 1231.5 711.5 Z M 1174.5 690.5 L 1195.5 690.5 L 1195.5 711.5 L 1174.5 711.5 Z M 1118.5 690.5 L 1139.5 690.5 L 1139.5 711.5 L 1118.5 711.5 Z M 1062.5 690.5 L 1082.5 690.5 L 1082.5 711.5 L 1062.5 711.5 Z M 1005.5 690.5 L 1026.5 690.5 L 1026.5 711.5 L 1005.5 711.5 Z M 949.5 690.5 L 970.5 690.5 L 970.5 711.5 L 949.5 711.5 Z M 892.5 690.5 L 913.5 690.5 L 913.5 711.5 L 892.5 711.5 Z M 836.5 690.5 L 857.5 690.5 L 857.5 711.5 L 836.5 711.5 Z M 780.5 690.5 L 800.5 690.5 L 800.5 711.5 L 780.5 711.5 Z M 723.5 690.5 L 744.5 690.5 L 744.5 711.5 L 723.5 711.5 Z M 667.5 690.5 L 688.5 690.5 L 688.5 711.5 L 667.5 711.5 Z M 610.5 690.5 L 631.5 690.5 L 631.5 711.5 L 610.5 711.5 Z M 554.5 690.5 L 575.5 690.5 L 575.5 711.5 L 554.5 711.5 Z M 498.5 690.5 L 518.5 690.5 L 518.5 711.5 L 498.5 711.5 Z M 441.5 690.5 L 462.5 690.5 L 462.5 711.5 L 441.5 711.5 Z M 385.5 690.5 L 406.5 690.5 L 406.5 711.5 L 385.5 711.5 Z M 328.5 690.5 L 349.5 690.5 L 349.5 711.5 L 328.5 711.5 Z M 272.5 690.5 L 293.5 690.5 L 293.5 711.5 L 272.5 711.5 Z M 272.5 690.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image484"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface452">
+<g id="surface478">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -230,6 +230,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 1540.148438 527.59375 L 1538.382812 527.59375 L 1538.257812 527.066406 L 1538.085938 526.582031 L 1537.855469 526.160156 L 1537.5625 525.824219 L 1537.203125 525.574219 L 1536.804688 525.363281 L 1536.46875 525.277344 L 1536.300781 525.257812 L 1536.132812 525.214844 L 1535.941406 525.214844 L 1535.773438 525.195312 L 1535.226562 525.257812 L 1534.742188 525.382812 L 1534.300781 525.59375 L 1533.902344 525.910156 L 1533.566406 526.308594 L 1533.292969 526.773438 L 1533.101562 527.171875 L 1532.976562 527.59375 L 1532.847656 528.035156 L 1532.722656 529.042969 L 1532.722656 529.589844 L 1532.742188 530.390625 L 1532.847656 531.085938 L 1533.039062 531.714844 L 1533.269531 532.261719 L 1533.585938 532.746094 L 1533.984375 533.148438 L 1534.238281 533.355469 L 1534.511719 533.503906 L 1534.804688 533.628906 L 1535.121094 533.714844 L 1535.457031 533.777344 L 1535.816406 533.777344 L 1536.511719 533.714844 L 1537.097656 533.484375 L 1537.605469 533.125 L 1538.003906 532.597656 L 1538.296875 531.949219 L 1538.507812 531.125 L 1540.277344 531.125 L 1540.171875 531.925781 L 1539.980469 532.621094 L 1539.707031 533.25 L 1539.351562 533.796875 L 1538.90625 534.28125 L 1538.402344 534.683594 L 1538.023438 534.914062 L 1537.625 535.082031 L 1537.203125 535.207031 L 1536.742188 535.3125 L 1536.257812 535.375 L 1535.773438 535.398438 L 1535.039062 535.335938 L 1534.363281 535.207031 L 1533.734375 534.976562 L 1533.164062 534.683594 L 1532.640625 534.28125 L 1532.175781 533.777344 L 1531.777344 533.25 L 1531.441406 532.640625 L 1531.207031 531.96875 L 1531.019531 531.230469 L 1530.914062 530.453125 L 1530.894531 529.589844 L 1530.914062 528.6875 L 1531.039062 527.84375 L 1531.25 527.066406 L 1531.523438 526.351562 L 1531.882812 525.699219 L 1532.324219 525.109375 L 1532.785156 524.648438 L 1533.292969 524.269531 L 1533.839844 523.972656 L 1534.449219 523.765625 L 1535.101562 523.636719 L 1535.792969 523.574219 L 1536.574219 523.636719 L 1537.289062 523.765625 L 1537.941406 524.015625 L 1538.507812 524.332031 L 1538.992188 524.773438 L 1539.414062 525.277344 L 1539.601562 525.613281 L 1539.769531 525.953125 L 1539.898438 526.332031 L 1540.023438 526.730469 L 1540.085938 527.152344 Z M 1540.148438 527.59375 "/>
 <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 1543.726562 519.578125 L 1543.726562 528.558594 L 1548.394531 523.890625 L 1550.648438 523.890625 L 1546.820312 527.699219 L 1551.320312 534.914062 L 1549.152344 534.914062 L 1545.429688 528.9375 L 1543.726562 530.621094 L 1543.726562 534.914062 L 1541.980469 534.914062 L 1541.980469 519.578125 Z M 1543.726562 519.578125 "/>
 <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 198 375 L 198 380 M 195 378 L 200 378 M 913 552 L 913 559 M 909 556 L 916 556 M 1468 548 L 1468 555 M 1464 552 L 1471 552 " 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 198 373 L 198 382 M 193 378 L 202 378 M 197 379 L 199 379 M 197 377 L 199 377 M 197 377 L 197 379 M 199 377 L 199 379 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.svg b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.svg
index 6cb8d98..d126dc4 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.svg
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 350.5 L 1743.5 350.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 350.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image483" 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="#image483"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 214.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image483"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1656.5 590.5 L 1674.5 590.5 L 1674.5 667.5 L 1656.5 667.5 Z M 500.5 617.5 L 518.5 617.5 L 518.5 667.5 L 500.5 667.5 Z M 385.5 617.5 L 403.5 617.5 L 403.5 667.5 L 385.5 667.5 Z M 1545.5 617.5 L 1563.5 617.5 L 1563.5 667.5 L 1545.5 667.5 Z M 1420.5 617.5 L 1438.5 617.5 L 1438.5 667.5 L 1420.5 667.5 Z M 1352.5 617.5 L 1370.5 617.5 L 1370.5 667.5 L 1352.5 667.5 Z M 1296.5 617.5 L 1313.5 617.5 L 1313.5 667.5 L 1296.5 667.5 Z M 1253.5 617.5 L 1271.5 617.5 L 1271.5 667.5 L 1253.5 667.5 Z M 286.5 617.5 L 304.5 617.5 L 304.5 667.5 L 286.5 667.5 Z M 243.5 617.5 L 261.5 617.5 L 261.5 667.5 L 243.5 667.5 Z M 1019.5 617.5 L 1036.5 617.5 L 1036.5 667.5 L 1019.5 667.5 Z M 976.5 617.5 L 994.5 617.5 L 994.5 667.5 L 976.5 667.5 Z M 865.5 617.5 L 882.5 617.5 L 882.5 667.5 L 865.5 667.5 Z M 822.5 617.5 L 840.5 617.5 L 840.5 667.5 L 822.5 667.5 Z M 772.5 617.5 L 790.5 617.5 L 790.5 667.5 L 772.5 667.5 Z M 661.5 617.5 L 679.5 617.5 L 679.5 667.5 L 661.5 667.5 Z M 611.5 617.5 L 629.5 617.5 L 629.5 667.5 L 611.5 667.5 Z M 336.5 617.5 L 353.5 617.5 L 353.5 667.5 L 336.5 667.5 Z M 1181.5 591.5 L 1198.5 591.5 L 1198.5 667.5 L 1181.5 667.5 Z M 1075.5 591.5 L 1093.5 591.5 L 1093.5 667.5 L 1075.5 667.5 Z M 1601.5 590.5 L 1619.5 590.5 L 1619.5 667.5 L 1601.5 667.5 Z M 1601.5 590.5 "/>
 </clipPath>
-<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image457"/>
+  <use xlink:href="#image484"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1434.5 401.5 L 1452.5 401.5 L 1452.5 450.5 L 1434.5 450.5 Z M 1323.5 401.5 L 1340.5 401.5 L 1340.5 450.5 L 1323.5 450.5 Z M 1013.5 401.5 L 1030.5 401.5 L 1030.5 450.5 L 1013.5 450.5 Z M 1251.5 401.5 L 1268.5 401.5 L 1268.5 450.5 L 1251.5 450.5 Z M 955.5 401.5 L 972.5 401.5 L 972.5 450.5 L 955.5 450.5 Z M 879.5 401.5 L 897.5 401.5 L 897.5 450.5 L 879.5 450.5 Z M 1198.5 401.5 L 1216.5 401.5 L 1216.5 450.5 L 1198.5 450.5 Z M 819.5 401.5 L 836.5 401.5 L 836.5 450.5 L 819.5 450.5 Z M 769.5 401.5 L 787.5 401.5 L 787.5 450.5 L 769.5 450.5 Z M 497.5 401.5 L 514.5 401.5 L 514.5 476.5 L 497.5 476.5 Z M 385.5 401.5 L 403.5 401.5 L 403.5 476.5 L 385.5 476.5 Z M 293.5 401.5 L 311.5 401.5 L 311.5 476.5 L 293.5 476.5 Z M 336.5 401.5 L 353.5 401.5 L 353.5 476.5 L 336.5 476.5 Z M 243.5 401.5 L 261.5 401.5 L 261.5 476.5 L 243.5 476.5 Z M 608.5 401.5 L 626.5 401.5 L 626.5 476.5 L 608.5 476.5 Z M 658.5 401.5 L 675.5 401.5 L 675.5 476.5 L 658.5 476.5 Z M 1545.5 406.5 L 1563.5 406.5 L 1563.5 482.5 L 1545.5 482.5 Z M 1081.5 401.5 L 1099.5 401.5 L 1099.5 500.5 L 1081.5 500.5 Z M 1124.5 401.5 L 1142.5 401.5 L 1142.5 500.5 L 1124.5 500.5 Z M 1601.5 401.5 L 1619.5 401.5 L 1619.5 519.5 L 1601.5 519.5 Z M 1656.5 401.5 L 1674.5 401.5 L 1674.5 519.5 L 1656.5 519.5 Z M 1656.5 401.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image485" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image485"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 214.5 363.5 L 234.5 363.5 L 234.5 383.5 L 214.5 383.5 Z M 1684.5 363.5 L 1704.5 363.5 L 1704.5 383.5 L 1684.5 383.5 Z M 1629.5 363.5 L 1649.5 363.5 L 1649.5 383.5 L 1629.5 383.5 Z M 1575.5 363.5 L 1595.5 363.5 L 1595.5 383.5 L 1575.5 383.5 Z M 1520.5 363.5 L 1541.5 363.5 L 1541.5 383.5 L 1520.5 383.5 Z M 1466.5 363.5 L 1486.5 363.5 L 1486.5 383.5 L 1466.5 383.5 Z M 1412.5 363.5 L 1432.5 363.5 L 1432.5 383.5 L 1412.5 383.5 Z M 1357.5 363.5 L 1377.5 363.5 L 1377.5 383.5 L 1357.5 383.5 Z M 1303.5 363.5 L 1323.5 363.5 L 1323.5 383.5 L 1303.5 383.5 Z M 1248.5 363.5 L 1268.5 363.5 L 1268.5 383.5 L 1248.5 383.5 Z M 1194.5 363.5 L 1214.5 363.5 L 1214.5 383.5 L 1194.5 383.5 Z M 1139.5 363.5 L 1159.5 363.5 L 1159.5 383.5 L 1139.5 383.5 Z M 1085.5 363.5 L 1105.5 363.5 L 1105.5 383.5 L 1085.5 383.5 Z M 1030.5 363.5 L 1051.5 363.5 L 1051.5 383.5 L 1030.5 383.5 Z M 976.5 363.5 L 996.5 363.5 L 996.5 383.5 L 976.5 383.5 Z M 922.5 363.5 L 942.5 363.5 L 942.5 383.5 L 922.5 383.5 Z M 867.5 363.5 L 887.5 363.5 L 887.5 383.5 L 867.5 383.5 Z M 813.5 363.5 L 833.5 363.5 L 833.5 383.5 L 813.5 383.5 Z M 758.5 363.5 L 778.5 363.5 L 778.5 383.5 L 758.5 383.5 Z M 704.5 363.5 L 724.5 363.5 L 724.5 383.5 L 704.5 383.5 Z M 649.5 363.5 L 669.5 363.5 L 669.5 383.5 L 649.5 383.5 Z M 595.5 363.5 L 615.5 363.5 L 615.5 383.5 L 595.5 383.5 Z M 540.5 363.5 L 561.5 363.5 L 561.5 383.5 L 540.5 383.5 Z M 486.5 363.5 L 506.5 363.5 L 506.5 383.5 L 486.5 383.5 Z M 432.5 363.5 L 452.5 363.5 L 452.5 383.5 L 432.5 383.5 Z M 377.5 363.5 L 397.5 363.5 L 397.5 383.5 L 377.5 383.5 Z M 323.5 363.5 L 343.5 363.5 L 343.5 383.5 L 323.5 383.5 Z M 268.5 363.5 L 288.5 363.5 L 288.5 383.5 L 268.5 383.5 Z M 813.5 463.5 L 833.5 463.5 L 833.5 479.5 L 813.5 479.5 Z M 813.5 479.5 L 833.5 479.5 L 833.5 483.5 L 813.5 483.5 Z M 649.5 463.5 L 669.5 463.5 L 669.5 483.5 L 649.5 483.5 Z M 1091.5 463.5 L 1111.5 463.5 L 1111.5 483.5 L 1091.5 483.5 Z M 377.5 504.5 L 397.5 504.5 L 397.5 524.5 L 377.5 524.5 Z M 758.5 504.5 L 778.5 504.5 L 778.5 524.5 L 758.5 524.5 Z M 982.5 504.5 L 1003.5 504.5 L 1003.5 524.5 L 982.5 524.5 Z M 1255.5 504.5 L 1275.5 504.5 L 1275.5 524.5 L 1255.5 524.5 Z M 486.5 544.5 L 506.5 544.5 L 506.5 547.5 L 486.5 547.5 Z M 704.5 544.5 L 724.5 544.5 L 724.5 556.5 L 704.5 556.5 Z M 268.5 544.5 L 288.5 544.5 L 288.5 557.5 L 268.5 557.5 Z M 486.5 547.5 L 506.5 547.5 L 506.5 564.5 L 486.5 564.5 Z M 1200.5 544.5 L 1220.5 544.5 L 1220.5 564.5 L 1200.5 564.5 Z M 268.5 557.5 L 288.5 557.5 L 288.5 564.5 L 268.5 564.5 Z M 704.5 556.5 L 724.5 556.5 L 724.5 564.5 L 704.5 564.5 Z M 214.5 685.5 L 234.5 685.5 L 234.5 705.5 L 214.5 705.5 Z M 1684.5 685.5 L 1704.5 685.5 L 1704.5 705.5 L 1684.5 705.5 Z M 1629.5 685.5 L 1649.5 685.5 L 1649.5 705.5 L 1629.5 705.5 Z M 1575.5 685.5 L 1595.5 685.5 L 1595.5 705.5 L 1575.5 705.5 Z M 1520.5 685.5 L 1541.5 685.5 L 1541.5 705.5 L 1520.5 705.5 Z M 1466.5 685.5 L 1486.5 685.5 L 1486.5 705.5 L 1466.5 705.5 Z M 1412.5 685.5 L 1432.5 685.5 L 1432.5 705.5 L 1412.5 705.5 Z M 1357.5 685.5 L 1377.5 685.5 L 1377.5 705.5 L 1357.5 705.5 Z M 1303.5 685.5 L 1323.5 685.5 L 1323.5 705.5 L 1303.5 705.5 Z M 1248.5 685.5 L 1268.5 685.5 L 1268.5 705.5 L 1248.5 705.5 Z M 1194.5 685.5 L 1214.5 685.5 L 1214.5 705.5 L 1194.5 705.5 Z M 1139.5 685.5 L 1159.5 685.5 L 1159.5 705.5 L 1139.5 705.5 Z M 1085.5 685.5 L 1105.5 685.5 L 1105.5 705.5 L 1085.5 705.5 Z M 1030.5 685.5 L 1051.5 685.5 L 1051.5 705.5 L 1030.5 705.5 Z M 976.5 685.5 L 996.5 685.5 L 996.5 705.5 L 976.5 705.5 Z M 922.5 685.5 L 942.5 685.5 L 942.5 705.5 L 922.5 705.5 Z M 867.5 685.5 L 887.5 685.5 L 887.5 705.5 L 867.5 705.5 Z M 813.5 685.5 L 833.5 685.5 L 833.5 705.5 L 813.5 705.5 Z M 758.5 685.5 L 778.5 685.5 L 778.5 705.5 L 758.5 705.5 Z M 704.5 685.5 L 724.5 685.5 L 724.5 705.5 L 704.5 705.5 Z M 649.5 685.5 L 669.5 685.5 L 669.5 705.5 L 649.5 705.5 Z M 595.5 685.5 L 615.5 685.5 L 615.5 705.5 L 595.5 705.5 Z M 540.5 685.5 L 561.5 685.5 L 561.5 705.5 L 540.5 705.5 Z M 486.5 685.5 L 506.5 685.5 L 506.5 705.5 L 486.5 705.5 Z M 432.5 685.5 L 452.5 685.5 L 452.5 705.5 L 432.5 705.5 Z M 377.5 685.5 L 397.5 685.5 L 397.5 705.5 L 377.5 705.5 Z M 323.5 685.5 L 343.5 685.5 L 343.5 705.5 L 323.5 705.5 Z M 268.5 685.5 L 288.5 685.5 L 288.5 705.5 L 268.5 705.5 Z M 268.5 685.5 "/>
 </clipPath>
-<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image486"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface453">
+<g id="surface480">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -230,6 +230,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 1485.839844 562.386719 L 1484.191406 562.386719 L 1484.070312 561.894531 L 1483.914062 561.445312 L 1483.699219 561.050781 L 1483.425781 560.738281 L 1483.089844 560.5 L 1482.71875 560.304688 L 1482.558594 560.265625 L 1482.402344 560.226562 L 1482.246094 560.207031 L 1482.089844 560.167969 L 1481.914062 560.167969 L 1481.753906 560.148438 L 1481.246094 560.207031 L 1480.792969 560.324219 L 1480.378906 560.519531 L 1480.007812 560.816406 L 1479.695312 561.1875 L 1479.4375 561.621094 L 1479.261719 561.992188 L 1479.144531 562.386719 L 1479.027344 562.796875 L 1478.96875 563.269531 L 1478.90625 563.742188 L 1478.90625 564.25 L 1478.929688 564.996094 L 1479.027344 565.644531 L 1479.203125 566.234375 L 1479.417969 566.746094 L 1479.714844 567.195312 L 1480.085938 567.570312 L 1480.320312 567.765625 L 1480.578125 567.902344 L 1480.851562 568.023438 L 1481.148438 568.101562 L 1481.460938 568.160156 L 1481.792969 568.160156 L 1482.441406 568.101562 L 1482.992188 567.882812 L 1483.464844 567.550781 L 1483.835938 567.058594 L 1484.113281 566.449219 L 1484.308594 565.683594 L 1485.957031 565.683594 L 1485.859375 566.429688 L 1485.683594 567.078125 L 1485.425781 567.667969 L 1485.09375 568.179688 L 1484.679688 568.628906 L 1484.210938 569.003906 L 1483.855469 569.21875 L 1483.484375 569.375 L 1483.089844 569.496094 L 1482.660156 569.59375 L 1482.207031 569.652344 L 1481.753906 569.671875 L 1481.066406 569.613281 L 1480.441406 569.496094 L 1479.851562 569.277344 L 1479.320312 569.003906 L 1478.828125 568.628906 L 1478.398438 568.160156 L 1478.023438 567.667969 L 1477.710938 567.097656 L 1477.496094 566.46875 L 1477.316406 565.785156 L 1477.21875 565.058594 L 1477.199219 564.25 L 1477.21875 563.40625 L 1477.335938 562.621094 L 1477.535156 561.894531 L 1477.789062 561.226562 L 1478.121094 560.621094 L 1478.535156 560.070312 L 1478.96875 559.636719 L 1479.4375 559.285156 L 1479.949219 559.007812 L 1480.519531 558.8125 L 1481.125 558.695312 L 1481.773438 558.636719 L 1482.5 558.695312 L 1483.167969 558.8125 L 1483.777344 559.046875 L 1484.308594 559.34375 L 1484.757812 559.753906 L 1485.152344 560.226562 L 1485.328125 560.539062 L 1485.484375 560.855469 L 1485.605469 561.207031 L 1485.722656 561.582031 L 1485.78125 561.972656 Z M 1485.839844 562.386719 "/>
 <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 1489.175781 554.90625 L 1489.175781 563.289062 L 1493.535156 558.929688 L 1495.636719 558.929688 L 1492.0625 562.484375 L 1496.265625 569.21875 L 1494.242188 569.21875 L 1490.769531 563.644531 L 1489.175781 565.214844 L 1489.175781 569.21875 L 1487.546875 569.21875 L 1487.546875 554.90625 Z M 1489.175781 554.90625 "/>
 <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 197 381 L 197 386 M 194 384 L 199 384 M 888 552 L 888 559 M 884 556 L 891 556 M 1421 514 L 1421 521 M 1417 518 L 1424 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 197 379 L 197 388 M 192 384 L 201 384 M 196 385 L 198 385 M 196 383 L 198 383 M 196 383 L 196 385 M 198 383 L 198 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.svg b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.svg
index a1956b5..5a446fa 100644
--- a/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.svg
+++ b/cells/sdfstp/sky130_fd_sc_hd__sdfstp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 362.5 L 1743.5 362.5 L 1743.5 540.5 L 174.5 540.5 Z M 174.5 362.5 "/>
 </clipPath>
-<image id="image459" 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="#image459"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 675.5 L 230.5 675.5 L 230.5 694.5 L 211.5 694.5 Z M 211.5 675.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1607.5 586.5 L 1624.5 586.5 L 1624.5 658.5 L 1607.5 658.5 Z M 583.5 612.5 L 600.5 612.5 L 600.5 658.5 L 583.5 658.5 Z M 479.5 612.5 L 496.5 612.5 L 496.5 658.5 L 479.5 658.5 Z M 372.5 612.5 L 388.5 612.5 L 388.5 658.5 L 372.5 658.5 Z M 325.5 612.5 L 342.5 612.5 L 342.5 658.5 L 325.5 658.5 Z M 279.5 612.5 L 295.5 612.5 L 295.5 658.5 L 279.5 658.5 Z M 1339.5 612.5 L 1355.5 612.5 L 1355.5 658.5 L 1339.5 658.5 Z M 1276.5 612.5 L 1292.5 612.5 L 1292.5 658.5 L 1276.5 658.5 Z M 1223.5 612.5 L 1239.5 612.5 L 1239.5 658.5 L 1223.5 658.5 Z M 1183.5 612.5 L 1199.5 612.5 L 1199.5 658.5 L 1183.5 658.5 Z M 239.5 612.5 L 255.5 612.5 L 255.5 658.5 L 239.5 658.5 Z M 630.5 612.5 L 646.5 612.5 L 646.5 658.5 L 630.5 658.5 Z M 964.5 612.5 L 980.5 612.5 L 980.5 658.5 L 964.5 658.5 Z M 924.5 612.5 L 940.5 612.5 L 940.5 658.5 L 924.5 658.5 Z M 820.5 612.5 L 836.5 612.5 L 836.5 658.5 L 820.5 658.5 Z M 780.5 612.5 L 797.5 612.5 L 797.5 658.5 L 780.5 658.5 Z M 734.5 612.5 L 750.5 612.5 L 750.5 658.5 L 734.5 658.5 Z M 1016.5 587.5 L 1033.5 587.5 L 1033.5 658.5 L 1016.5 658.5 Z M 1115.5 587.5 L 1132.5 587.5 L 1132.5 658.5 L 1115.5 658.5 Z M 1654.5 586.5 L 1670.5 586.5 L 1670.5 658.5 L 1654.5 658.5 Z M 1555.5 586.5 L 1572.5 586.5 L 1572.5 658.5 L 1555.5 658.5 Z M 1509.5 586.5 L 1525.5 586.5 L 1525.5 658.5 L 1509.5 658.5 Z M 1456.5 586.5 L 1473.5 586.5 L 1473.5 658.5 L 1456.5 658.5 Z M 1456.5 586.5 "/>
 </clipPath>
-<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image460"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1352.5 409.5 L 1369.5 409.5 L 1369.5 456.5 L 1352.5 456.5 Z M 1181.5 409.5 L 1197.5 409.5 L 1197.5 456.5 L 1181.5 456.5 Z M 1132.5 409.5 L 1149.5 409.5 L 1149.5 456.5 L 1132.5 456.5 Z M 730.5 409.5 L 747.5 409.5 L 747.5 456.5 L 730.5 456.5 Z M 1248.5 409.5 L 1265.5 409.5 L 1265.5 456.5 L 1248.5 456.5 Z M 958.5 409.5 L 975.5 409.5 L 975.5 456.5 L 958.5 456.5 Z M 904.5 409.5 L 921.5 409.5 L 921.5 456.5 L 904.5 456.5 Z M 833.5 409.5 L 850.5 409.5 L 850.5 456.5 L 833.5 456.5 Z M 777.5 409.5 L 793.5 409.5 L 793.5 456.5 L 777.5 456.5 Z M 239.5 409.5 L 255.5 409.5 L 255.5 480.5 L 239.5 480.5 Z M 626.5 409.5 L 643.5 409.5 L 643.5 480.5 L 626.5 480.5 Z M 580.5 409.5 L 596.5 409.5 L 596.5 480.5 L 580.5 480.5 Z M 372.5 409.5 L 388.5 409.5 L 388.5 480.5 L 372.5 480.5 Z M 325.5 409.5 L 342.5 409.5 L 342.5 480.5 L 325.5 480.5 Z M 285.5 409.5 L 302.5 409.5 L 302.5 480.5 L 285.5 480.5 Z M 476.5 409.5 L 492.5 409.5 L 492.5 480.5 L 476.5 480.5 Z M 1062.5 409.5 L 1079.5 409.5 L 1079.5 502.5 L 1062.5 502.5 Z M 1022.5 409.5 L 1039.5 409.5 L 1039.5 502.5 L 1022.5 502.5 Z M 1509.5 409.5 L 1525.5 409.5 L 1525.5 520.5 L 1509.5 520.5 Z M 1555.5 409.5 L 1572.5 409.5 L 1572.5 520.5 L 1555.5 520.5 Z M 1456.5 409.5 L 1473.5 409.5 L 1473.5 520.5 L 1456.5 520.5 Z M 1607.5 409.5 L 1624.5 409.5 L 1624.5 520.5 L 1607.5 520.5 Z M 1654.5 409.5 L 1670.5 409.5 L 1670.5 520.5 L 1654.5 520.5 Z M 1654.5 409.5 "/>
 </clipPath>
-<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image461"/>
+  <use xlink:href="#image488"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 374.5 L 230.5 374.5 L 230.5 393.5 L 211.5 393.5 Z M 1687.5 374.5 L 1706.5 374.5 L 1706.5 393.5 L 1687.5 393.5 Z M 1637.5 374.5 L 1655.5 374.5 L 1655.5 393.5 L 1637.5 393.5 Z M 1586.5 374.5 L 1604.5 374.5 L 1604.5 393.5 L 1586.5 393.5 Z M 1535.5 374.5 L 1554.5 374.5 L 1554.5 393.5 L 1535.5 393.5 Z M 1484.5 374.5 L 1503.5 374.5 L 1503.5 393.5 L 1484.5 393.5 Z M 1433.5 374.5 L 1452.5 374.5 L 1452.5 393.5 L 1433.5 393.5 Z M 1382.5 374.5 L 1401.5 374.5 L 1401.5 393.5 L 1382.5 393.5 Z M 1331.5 374.5 L 1350.5 374.5 L 1350.5 393.5 L 1331.5 393.5 Z M 1280.5 374.5 L 1299.5 374.5 L 1299.5 393.5 L 1280.5 393.5 Z M 1229.5 374.5 L 1248.5 374.5 L 1248.5 393.5 L 1229.5 393.5 Z M 1178.5 374.5 L 1197.5 374.5 L 1197.5 393.5 L 1178.5 393.5 Z M 1128.5 374.5 L 1146.5 374.5 L 1146.5 393.5 L 1128.5 393.5 Z M 1077.5 374.5 L 1095.5 374.5 L 1095.5 393.5 L 1077.5 393.5 Z M 1026.5 374.5 L 1045.5 374.5 L 1045.5 393.5 L 1026.5 393.5 Z M 975.5 374.5 L 994.5 374.5 L 994.5 393.5 L 975.5 393.5 Z M 924.5 374.5 L 943.5 374.5 L 943.5 393.5 L 924.5 393.5 Z M 873.5 374.5 L 892.5 374.5 L 892.5 393.5 L 873.5 393.5 Z M 822.5 374.5 L 841.5 374.5 L 841.5 393.5 L 822.5 393.5 Z M 771.5 374.5 L 790.5 374.5 L 790.5 393.5 L 771.5 393.5 Z M 720.5 374.5 L 739.5 374.5 L 739.5 393.5 L 720.5 393.5 Z M 669.5 374.5 L 688.5 374.5 L 688.5 393.5 L 669.5 393.5 Z M 618.5 374.5 L 637.5 374.5 L 637.5 393.5 L 618.5 393.5 Z M 568.5 374.5 L 586.5 374.5 L 586.5 393.5 L 568.5 393.5 Z M 517.5 374.5 L 535.5 374.5 L 535.5 393.5 L 517.5 393.5 Z M 466.5 374.5 L 485.5 374.5 L 485.5 393.5 L 466.5 393.5 Z M 415.5 374.5 L 434.5 374.5 L 434.5 393.5 L 415.5 393.5 Z M 364.5 374.5 L 383.5 374.5 L 383.5 393.5 L 364.5 393.5 Z M 313.5 374.5 L 332.5 374.5 L 332.5 393.5 L 313.5 393.5 Z M 262.5 374.5 L 281.5 374.5 L 281.5 393.5 L 262.5 393.5 Z M 771.5 468.5 L 790.5 468.5 L 790.5 482.5 L 771.5 482.5 Z M 771.5 482.5 L 790.5 482.5 L 790.5 487.5 L 771.5 487.5 Z M 1032.5 468.5 L 1051.5 468.5 L 1051.5 487.5 L 1032.5 487.5 Z M 618.5 468.5 L 637.5 468.5 L 637.5 487.5 L 618.5 487.5 Z M 720.5 505.5 L 739.5 505.5 L 739.5 524.5 L 720.5 524.5 Z M 930.5 505.5 L 949.5 505.5 L 949.5 524.5 L 930.5 524.5 Z M 1185.5 505.5 L 1203.5 505.5 L 1203.5 524.5 L 1185.5 524.5 Z M 364.5 505.5 L 383.5 505.5 L 383.5 524.5 L 364.5 524.5 Z M 466.5 543.5 L 485.5 543.5 L 485.5 546.5 L 466.5 546.5 Z M 669.5 543.5 L 688.5 543.5 L 688.5 555.5 L 669.5 555.5 Z M 262.5 543.5 L 281.5 543.5 L 281.5 555.5 L 262.5 555.5 Z M 466.5 546.5 L 485.5 546.5 L 485.5 562.5 L 466.5 562.5 Z M 1134.5 543.5 L 1152.5 543.5 L 1152.5 562.5 L 1134.5 562.5 Z M 669.5 555.5 L 688.5 555.5 L 688.5 562.5 L 669.5 562.5 Z M 262.5 555.5 L 281.5 555.5 L 281.5 562.5 L 262.5 562.5 Z M 211.5 675.5 L 230.5 675.5 L 230.5 694.5 L 211.5 694.5 Z M 1687.5 675.5 L 1706.5 675.5 L 1706.5 694.5 L 1687.5 694.5 Z M 1637.5 675.5 L 1655.5 675.5 L 1655.5 694.5 L 1637.5 694.5 Z M 1586.5 675.5 L 1604.5 675.5 L 1604.5 694.5 L 1586.5 694.5 Z M 1535.5 675.5 L 1554.5 675.5 L 1554.5 694.5 L 1535.5 694.5 Z M 1484.5 675.5 L 1503.5 675.5 L 1503.5 694.5 L 1484.5 694.5 Z M 1433.5 675.5 L 1452.5 675.5 L 1452.5 694.5 L 1433.5 694.5 Z M 1382.5 675.5 L 1401.5 675.5 L 1401.5 694.5 L 1382.5 694.5 Z M 1331.5 675.5 L 1350.5 675.5 L 1350.5 694.5 L 1331.5 694.5 Z M 1280.5 675.5 L 1299.5 675.5 L 1299.5 694.5 L 1280.5 694.5 Z M 1229.5 675.5 L 1248.5 675.5 L 1248.5 694.5 L 1229.5 694.5 Z M 1178.5 675.5 L 1197.5 675.5 L 1197.5 694.5 L 1178.5 694.5 Z M 1128.5 675.5 L 1146.5 675.5 L 1146.5 694.5 L 1128.5 694.5 Z M 1077.5 675.5 L 1095.5 675.5 L 1095.5 694.5 L 1077.5 694.5 Z M 1026.5 675.5 L 1045.5 675.5 L 1045.5 694.5 L 1026.5 694.5 Z M 975.5 675.5 L 994.5 675.5 L 994.5 694.5 L 975.5 694.5 Z M 924.5 675.5 L 943.5 675.5 L 943.5 694.5 L 924.5 694.5 Z M 873.5 675.5 L 892.5 675.5 L 892.5 694.5 L 873.5 694.5 Z M 822.5 675.5 L 841.5 675.5 L 841.5 694.5 L 822.5 694.5 Z M 771.5 675.5 L 790.5 675.5 L 790.5 694.5 L 771.5 694.5 Z M 720.5 675.5 L 739.5 675.5 L 739.5 694.5 L 720.5 694.5 Z M 669.5 675.5 L 688.5 675.5 L 688.5 694.5 L 669.5 694.5 Z M 618.5 675.5 L 637.5 675.5 L 637.5 694.5 L 618.5 694.5 Z M 568.5 675.5 L 586.5 675.5 L 586.5 694.5 L 568.5 694.5 Z M 517.5 675.5 L 535.5 675.5 L 535.5 694.5 L 517.5 694.5 Z M 466.5 675.5 L 485.5 675.5 L 485.5 694.5 L 466.5 694.5 Z M 415.5 675.5 L 434.5 675.5 L 434.5 694.5 L 415.5 694.5 Z M 364.5 675.5 L 383.5 675.5 L 383.5 694.5 L 364.5 694.5 Z M 313.5 675.5 L 332.5 675.5 L 332.5 694.5 L 313.5 694.5 Z M 262.5 675.5 L 281.5 675.5 L 281.5 694.5 L 262.5 694.5 Z M 262.5 675.5 "/>
 </clipPath>
-<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image462"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface456">
+<g id="surface483">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -233,6 +233,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 1408.53125 526.179688 L 1406.996094 526.179688 L 1406.886719 525.722656 L 1406.742188 525.304688 L 1406.542969 524.941406 L 1406.285156 524.648438 L 1405.976562 524.429688 L 1405.628906 524.246094 L 1405.339844 524.175781 L 1405.191406 524.15625 L 1405.046875 524.121094 L 1404.882812 524.121094 L 1404.738281 524.101562 L 1404.261719 524.15625 L 1403.84375 524.265625 L 1403.460938 524.449219 L 1403.113281 524.722656 L 1402.824219 525.066406 L 1402.585938 525.46875 L 1402.421875 525.816406 L 1402.3125 526.179688 L 1402.203125 526.5625 L 1402.09375 527.4375 L 1402.09375 527.914062 L 1402.113281 528.605469 L 1402.203125 529.207031 L 1402.367188 529.753906 L 1402.566406 530.226562 L 1402.839844 530.648438 L 1403.1875 530.992188 L 1403.40625 531.175781 L 1403.644531 531.304688 L 1403.898438 531.414062 L 1404.171875 531.484375 L 1404.464844 531.539062 L 1404.773438 531.539062 L 1405.375 531.484375 L 1405.886719 531.285156 L 1406.324219 530.976562 L 1406.667969 530.519531 L 1406.925781 529.953125 L 1407.105469 529.242188 L 1408.640625 529.242188 L 1408.546875 529.9375 L 1408.382812 530.539062 L 1408.148438 531.085938 L 1407.835938 531.558594 L 1407.453125 531.976562 L 1407.015625 532.324219 L 1406.6875 532.523438 L 1406.339844 532.671875 L 1405.976562 532.78125 L 1405.574219 532.871094 L 1405.15625 532.925781 L 1404.738281 532.945312 L 1404.097656 532.890625 L 1403.515625 532.78125 L 1402.96875 532.578125 L 1402.476562 532.324219 L 1402.019531 531.976562 L 1401.621094 531.539062 L 1401.273438 531.085938 L 1400.980469 530.554688 L 1400.78125 529.972656 L 1400.617188 529.335938 L 1400.523438 528.660156 L 1400.507812 527.914062 L 1400.523438 527.128906 L 1400.632812 526.398438 L 1400.816406 525.722656 L 1401.054688 525.105469 L 1401.363281 524.539062 L 1401.746094 524.027344 L 1402.148438 523.628906 L 1402.585938 523.300781 L 1403.058594 523.042969 L 1403.589844 522.863281 L 1404.152344 522.753906 L 1404.753906 522.699219 L 1405.429688 522.753906 L 1406.050781 522.863281 L 1406.613281 523.082031 L 1407.105469 523.355469 L 1407.527344 523.738281 L 1407.890625 524.175781 L 1408.054688 524.464844 L 1408.203125 524.757812 L 1408.3125 525.085938 L 1408.421875 525.433594 L 1408.476562 525.796875 Z M 1408.53125 526.179688 "/>
 <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 1411.628906 519.234375 L 1411.628906 527.019531 L 1415.675781 522.972656 L 1417.628906 522.972656 L 1414.308594 526.269531 L 1418.210938 532.523438 L 1416.332031 532.523438 L 1413.105469 527.347656 L 1411.628906 528.804688 L 1411.628906 532.523438 L 1410.117188 532.523438 L 1410.117188 519.234375 Z M 1411.628906 519.234375 "/>
 <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 841 549 L 841 556 M 837 553 L 844 553 M 195 392 L 195 397 M 192 395 L 197 395 M 1348 550 L 1348 557 M 1344 554 L 1351 554 " 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 390 L 195 399 M 190 395 L 199 395 M 194 396 L 196 396 M 194 394 L 196 394 M 194 394 L 194 396 M 196 394 L 196 396 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.svg b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.svg
index 6a20dff..d954d3f 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.svg
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1641.5 599.5 L 1662.5 599.5 L 1662.5 689.5 L 1641.5 689.5 Z M 1122.5 639.5 L 1143.5 639.5 L 1143.5 689.5 L 1122.5 689.5 Z M 885.5 639.5 L 906.5 639.5 L 906.5 689.5 L 885.5 689.5 Z M 819.5 639.5 L 840.5 639.5 L 840.5 689.5 L 819.5 689.5 Z M 1193.5 639.5 L 1214.5 639.5 L 1214.5 689.5 L 1193.5 689.5 Z M 1258.5 631.5 L 1279.5 631.5 L 1279.5 689.5 L 1258.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 565.5 631.5 L 586.5 631.5 L 586.5 689.5 L 565.5 689.5 Z M 683.5 631.5 L 704.5 631.5 L 704.5 689.5 L 683.5 689.5 Z M 953.5 631.5 L 973.5 631.5 L 973.5 689.5 L 953.5 689.5 Z M 1575.5 631.5 L 1595.5 631.5 L 1595.5 689.5 L 1575.5 689.5 Z M 442.5 631.5 L 462.5 631.5 L 462.5 689.5 L 442.5 689.5 Z M 512.5 631.5 L 532.5 631.5 L 532.5 689.5 L 512.5 689.5 Z M 631.5 631.5 L 652.5 631.5 L 652.5 689.5 L 631.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 1053.5 601.5 L 1074.5 601.5 L 1074.5 689.5 L 1053.5 689.5 Z M 1445.5 599.5 L 1466.5 599.5 L 1466.5 689.5 L 1445.5 689.5 Z M 1388.5 599.5 L 1408.5 599.5 L 1408.5 689.5 L 1388.5 689.5 Z M 1388.5 599.5 "/>
 </clipPath>
-<image id="image325" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1243.5 379.5 L 1263.5 379.5 L 1263.5 437.5 L 1243.5 437.5 Z M 949.5 379.5 L 969.5 379.5 L 969.5 437.5 L 949.5 437.5 Z M 883.5 379.5 L 903.5 379.5 L 903.5 437.5 L 883.5 437.5 Z M 819.5 379.5 L 839.5 379.5 L 839.5 437.5 L 819.5 437.5 Z M 1162.5 379.5 L 1183.5 379.5 L 1183.5 437.5 L 1162.5 437.5 Z M 1105.5 379.5 L 1125.5 379.5 L 1125.5 437.5 L 1105.5 437.5 Z M 620.5 379.5 L 640.5 379.5 L 640.5 467.5 L 620.5 467.5 Z M 1575.5 379.5 L 1595.5 379.5 L 1595.5 467.5 L 1575.5 467.5 Z M 442.5 379.5 L 462.5 379.5 L 462.5 467.5 L 442.5 467.5 Z M 562.5 379.5 L 582.5 379.5 L 582.5 467.5 L 562.5 467.5 Z M 683.5 379.5 L 704.5 379.5 L 704.5 467.5 L 683.5 467.5 Z M 499.5 379.5 L 520.5 379.5 L 520.5 467.5 L 499.5 467.5 Z M 255.5 384.5 L 275.5 384.5 L 275.5 472.5 L 255.5 472.5 Z M 312.5 384.5 L 333.5 384.5 L 333.5 472.5 L 312.5 472.5 Z M 1039.5 379.5 L 1060.5 379.5 L 1060.5 483.5 L 1039.5 483.5 Z M 1641.5 379.5 L 1662.5 379.5 L 1662.5 517.5 L 1641.5 517.5 Z M 1388.5 379.5 L 1408.5 379.5 L 1408.5 517.5 L 1388.5 517.5 Z M 1445.5 379.5 L 1466.5 379.5 L 1466.5 517.5 L 1445.5 517.5 Z M 1445.5 379.5 "/>
 </clipPath>
-<image id="image326" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 910.5 452.5 L 934.5 452.5 L 934.5 470.5 L 910.5 470.5 Z M 910.5 470.5 L 934.5 470.5 L 934.5 476.5 L 910.5 476.5 Z M 289.5 452.5 L 312.5 452.5 L 312.5 476.5 L 289.5 476.5 Z M 1104.5 452.5 L 1127.5 452.5 L 1127.5 476.5 L 1104.5 476.5 Z M 852.5 592.5 L 876.5 592.5 L 876.5 616.5 L 852.5 616.5 Z M 1105.5 592.5 L 1129.5 592.5 L 1129.5 616.5 L 1105.5 616.5 Z M 340.5 592.5 L 363.5 592.5 L 363.5 616.5 L 340.5 616.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image327" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface321">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 232 728 L 232 735 M 228 732 L 235 732 " 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 232 732 L 232 732 M 232 732 L 232 732 M 232 732 L 232 732 M 232 732 L 232 732 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.svg b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.svg
index dabfa97..d04ca4e 100644
--- a/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.svg
+++ b/cells/sdfxbp/sky130_fd_sc_hd__sdfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1744.5 337.5 L 1744.5 541.5 L 174.5 541.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" 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="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 217.5 696.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1360.5 594.5 L 1379.5 594.5 L 1379.5 677.5 L 1360.5 677.5 Z M 837.5 631.5 L 856.5 631.5 L 856.5 677.5 L 837.5 677.5 Z M 776.5 631.5 L 795.5 631.5 L 795.5 677.5 L 776.5 677.5 Z M 1057.5 631.5 L 1076.5 631.5 L 1076.5 677.5 L 1057.5 677.5 Z M 1122.5 631.5 L 1141.5 631.5 L 1141.5 677.5 L 1122.5 677.5 Z M 249.5 624.5 L 268.5 624.5 L 268.5 677.5 L 249.5 677.5 Z M 648.5 624.5 L 667.5 624.5 L 667.5 677.5 L 648.5 677.5 Z M 1183.5 624.5 L 1202.5 624.5 L 1202.5 677.5 L 1183.5 677.5 Z M 302.5 624.5 L 321.5 624.5 L 321.5 677.5 L 302.5 677.5 Z M 1534.5 624.5 L 1553.5 624.5 L 1553.5 677.5 L 1534.5 677.5 Z M 424.5 624.5 L 443.5 624.5 L 443.5 677.5 L 424.5 677.5 Z M 900.5 624.5 L 919.5 624.5 L 919.5 677.5 L 900.5 677.5 Z M 539.5 624.5 L 558.5 624.5 L 558.5 677.5 L 539.5 677.5 Z M 489.5 624.5 L 508.5 624.5 L 508.5 677.5 L 489.5 677.5 Z M 600.5 624.5 L 619.5 624.5 L 619.5 677.5 L 600.5 677.5 Z M 993.5 596.5 L 1012.5 596.5 L 1012.5 677.5 L 993.5 677.5 Z M 1650.5 594.5 L 1669.5 594.5 L 1669.5 677.5 L 1650.5 677.5 Z M 1596.5 594.5 L 1615.5 594.5 L 1615.5 677.5 L 1596.5 677.5 Z M 1304.5 594.5 L 1323.5 594.5 L 1323.5 677.5 L 1304.5 677.5 Z M 1414.5 594.5 L 1433.5 594.5 L 1433.5 677.5 L 1414.5 677.5 Z M 1414.5 594.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1168.5 391.5 L 1187.5 391.5 L 1187.5 444.5 L 1168.5 444.5 Z M 1094.5 391.5 L 1113.5 391.5 L 1113.5 444.5 L 1094.5 444.5 Z M 1040.5 391.5 L 1059.5 391.5 L 1059.5 444.5 L 1040.5 444.5 Z M 896.5 391.5 L 915.5 391.5 L 915.5 444.5 L 896.5 444.5 Z M 835.5 391.5 L 854.5 391.5 L 854.5 444.5 L 835.5 444.5 Z M 776.5 391.5 L 795.5 391.5 L 795.5 444.5 L 776.5 444.5 Z M 589.5 391.5 L 608.5 391.5 L 608.5 472.5 L 589.5 472.5 Z M 535.5 391.5 L 554.5 391.5 L 554.5 472.5 L 535.5 472.5 Z M 476.5 391.5 L 495.5 391.5 L 495.5 472.5 L 476.5 472.5 Z M 422.5 391.5 L 441.5 391.5 L 441.5 472.5 L 422.5 472.5 Z M 1534.5 391.5 L 1553.5 391.5 L 1553.5 472.5 L 1534.5 472.5 Z M 648.5 391.5 L 667.5 391.5 L 667.5 472.5 L 648.5 472.5 Z M 303.5 395.5 L 322.5 395.5 L 322.5 476.5 L 303.5 476.5 Z M 249.5 395.5 L 268.5 395.5 L 268.5 476.5 L 249.5 476.5 Z M 980.5 391.5 L 999.5 391.5 L 999.5 486.5 L 980.5 486.5 Z M 1414.5 391.5 L 1433.5 391.5 L 1433.5 518.5 L 1414.5 518.5 Z M 1650.5 391.5 L 1669.5 391.5 L 1669.5 518.5 L 1650.5 518.5 Z M 1360.5 391.5 L 1379.5 391.5 L 1379.5 518.5 L 1360.5 518.5 Z M 1304.5 391.5 L 1323.5 391.5 L 1323.5 518.5 L 1304.5 518.5 Z M 1596.5 391.5 L 1615.5 391.5 L 1615.5 518.5 L 1596.5 518.5 Z M 1596.5 391.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 217.5 350.5 L 238.5 350.5 L 238.5 372.5 L 217.5 372.5 Z M 1679.5 350.5 L 1701.5 350.5 L 1701.5 372.5 L 1679.5 372.5 Z M 1621.5 350.5 L 1643.5 350.5 L 1643.5 372.5 L 1621.5 372.5 Z M 1562.5 350.5 L 1584.5 350.5 L 1584.5 372.5 L 1562.5 372.5 Z M 1504.5 350.5 L 1526.5 350.5 L 1526.5 372.5 L 1504.5 372.5 Z M 1445.5 350.5 L 1467.5 350.5 L 1467.5 372.5 L 1445.5 372.5 Z M 1387.5 350.5 L 1408.5 350.5 L 1408.5 372.5 L 1387.5 372.5 Z M 1328.5 350.5 L 1350.5 350.5 L 1350.5 372.5 L 1328.5 372.5 Z M 1270.5 350.5 L 1291.5 350.5 L 1291.5 372.5 L 1270.5 372.5 Z M 1211.5 350.5 L 1233.5 350.5 L 1233.5 372.5 L 1211.5 372.5 Z M 1153.5 350.5 L 1174.5 350.5 L 1174.5 372.5 L 1153.5 372.5 Z M 1094.5 350.5 L 1116.5 350.5 L 1116.5 372.5 L 1094.5 372.5 Z M 1036.5 350.5 L 1057.5 350.5 L 1057.5 372.5 L 1036.5 372.5 Z M 977.5 350.5 L 999.5 350.5 L 999.5 372.5 L 977.5 372.5 Z M 919.5 350.5 L 940.5 350.5 L 940.5 372.5 L 919.5 372.5 Z M 860.5 350.5 L 882.5 350.5 L 882.5 372.5 L 860.5 372.5 Z M 802.5 350.5 L 823.5 350.5 L 823.5 372.5 L 802.5 372.5 Z M 743.5 350.5 L 765.5 350.5 L 765.5 372.5 L 743.5 372.5 Z M 685.5 350.5 L 706.5 350.5 L 706.5 372.5 L 685.5 372.5 Z M 626.5 350.5 L 648.5 350.5 L 648.5 372.5 L 626.5 372.5 Z M 568.5 350.5 L 589.5 350.5 L 589.5 372.5 L 568.5 372.5 Z M 509.5 350.5 L 531.5 350.5 L 531.5 372.5 L 509.5 372.5 Z M 451.5 350.5 L 472.5 350.5 L 472.5 372.5 L 451.5 372.5 Z M 392.5 350.5 L 414.5 350.5 L 414.5 372.5 L 392.5 372.5 Z M 334.5 350.5 L 355.5 350.5 L 355.5 372.5 L 334.5 372.5 Z M 275.5 350.5 L 297.5 350.5 L 297.5 372.5 L 275.5 372.5 Z M 860.5 458.5 L 882.5 458.5 L 882.5 475.5 L 860.5 475.5 Z M 860.5 475.5 L 882.5 475.5 L 882.5 480.5 L 860.5 480.5 Z M 280.5 458.5 L 302.5 458.5 L 302.5 480.5 L 280.5 480.5 Z M 1041.5 458.5 L 1063.5 458.5 L 1063.5 480.5 L 1041.5 480.5 Z M 802.5 588.5 L 823.5 588.5 L 823.5 610.5 L 802.5 610.5 Z M 1043.5 588.5 L 1064.5 588.5 L 1064.5 610.5 L 1043.5 610.5 Z M 332.5 588.5 L 353.5 588.5 L 353.5 610.5 L 332.5 610.5 Z M 217.5 696.5 L 238.5 696.5 L 238.5 718.5 L 217.5 718.5 Z M 1679.5 696.5 L 1701.5 696.5 L 1701.5 718.5 L 1679.5 718.5 Z M 1621.5 696.5 L 1643.5 696.5 L 1643.5 718.5 L 1621.5 718.5 Z M 1562.5 696.5 L 1584.5 696.5 L 1584.5 718.5 L 1562.5 718.5 Z M 1504.5 696.5 L 1526.5 696.5 L 1526.5 718.5 L 1504.5 718.5 Z M 1445.5 696.5 L 1467.5 696.5 L 1467.5 718.5 L 1445.5 718.5 Z M 1387.5 696.5 L 1408.5 696.5 L 1408.5 718.5 L 1387.5 718.5 Z M 1328.5 696.5 L 1350.5 696.5 L 1350.5 718.5 L 1328.5 718.5 Z M 1270.5 696.5 L 1291.5 696.5 L 1291.5 718.5 L 1270.5 718.5 Z M 1211.5 696.5 L 1233.5 696.5 L 1233.5 718.5 L 1211.5 718.5 Z M 1153.5 696.5 L 1174.5 696.5 L 1174.5 718.5 L 1153.5 718.5 Z M 1094.5 696.5 L 1116.5 696.5 L 1116.5 718.5 L 1094.5 718.5 Z M 1036.5 696.5 L 1057.5 696.5 L 1057.5 718.5 L 1036.5 718.5 Z M 977.5 696.5 L 999.5 696.5 L 999.5 718.5 L 977.5 718.5 Z M 919.5 696.5 L 940.5 696.5 L 940.5 718.5 L 919.5 718.5 Z M 860.5 696.5 L 882.5 696.5 L 882.5 718.5 L 860.5 718.5 Z M 802.5 696.5 L 823.5 696.5 L 823.5 718.5 L 802.5 718.5 Z M 743.5 696.5 L 765.5 696.5 L 765.5 718.5 L 743.5 718.5 Z M 685.5 696.5 L 706.5 696.5 L 706.5 718.5 L 685.5 718.5 Z M 626.5 696.5 L 648.5 696.5 L 648.5 718.5 L 626.5 718.5 Z M 568.5 696.5 L 589.5 696.5 L 589.5 718.5 L 568.5 718.5 Z M 509.5 696.5 L 531.5 696.5 L 531.5 718.5 L 509.5 718.5 Z M 451.5 696.5 L 472.5 696.5 L 472.5 718.5 L 451.5 718.5 Z M 392.5 696.5 L 414.5 696.5 L 414.5 718.5 L 392.5 718.5 Z M 334.5 696.5 L 355.5 696.5 L 355.5 718.5 L 334.5 718.5 Z M 275.5 696.5 L 297.5 696.5 L 297.5 718.5 L 275.5 718.5 Z M 275.5 696.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <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 228 714 L 228 721 M 224 718 L 231 718 " 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 228 718 L 228 718 M 228 718 L 228 718 M 228 718 L 228 718 M 228 718 L 228 718 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 198 369 L 198 374 M 195 372 L 200 372 " 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 198 367 L 198 376 M 193 372 L 202 372 M 197 373 L 199 373 M 197 371 L 199 371 M 197 371 L 197 373 M 199 371 L 199 373 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.svg b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.svg
index 9498c6b..a7c29d0 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <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="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1628.5 609.5 L 1651.5 609.5 L 1651.5 710.5 L 1628.5 710.5 Z M 910.5 654.5 L 934.5 654.5 L 934.5 710.5 L 910.5 710.5 Z M 985.5 654.5 L 1009.5 654.5 L 1009.5 710.5 L 985.5 710.5 Z M 1255.5 654.5 L 1278.5 654.5 L 1278.5 710.5 L 1255.5 710.5 Z M 1336.5 654.5 L 1359.5 654.5 L 1359.5 710.5 L 1336.5 710.5 Z M 1410.5 645.5 L 1433.5 645.5 L 1433.5 710.5 L 1410.5 710.5 Z M 619.5 645.5 L 642.5 645.5 L 642.5 710.5 L 619.5 710.5 Z M 1062.5 645.5 L 1085.5 645.5 L 1085.5 710.5 L 1062.5 710.5 Z M 481.5 645.5 L 504.5 645.5 L 504.5 710.5 L 481.5 710.5 Z M 558.5 645.5 L 581.5 645.5 L 581.5 710.5 L 558.5 710.5 Z M 753.5 645.5 L 777.5 645.5 L 777.5 710.5 L 753.5 710.5 Z M 694.5 645.5 L 717.5 645.5 L 717.5 710.5 L 694.5 710.5 Z M 265.5 645.5 L 289.5 645.5 L 289.5 710.5 L 265.5 710.5 Z M 331.5 645.5 L 354.5 645.5 L 354.5 710.5 L 331.5 710.5 Z M 1176.5 610.5 L 1199.5 610.5 L 1199.5 710.5 L 1176.5 710.5 Z M 1557.5 609.5 L 1580.5 609.5 L 1580.5 710.5 L 1557.5 710.5 Z M 1557.5 609.5 "/>
 </clipPath>
-<image id="image322" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1392.5 358.5 L 1415.5 358.5 L 1415.5 424.5 L 1392.5 424.5 Z M 1300.5 358.5 L 1324.5 358.5 L 1324.5 424.5 L 1300.5 424.5 Z M 982.5 358.5 L 1006.5 358.5 L 1006.5 424.5 L 982.5 424.5 Z M 909.5 358.5 L 933.5 358.5 L 933.5 424.5 L 909.5 424.5 Z M 1235.5 358.5 L 1258.5 358.5 L 1258.5 424.5 L 1235.5 424.5 Z M 1057.5 358.5 L 1081.5 358.5 L 1081.5 424.5 L 1057.5 424.5 Z M 680.5 358.5 L 704.5 358.5 L 704.5 459.5 L 680.5 459.5 Z M 545.5 358.5 L 569.5 358.5 L 569.5 459.5 L 545.5 459.5 Z M 754.5 358.5 L 777.5 358.5 L 777.5 459.5 L 754.5 459.5 Z M 615.5 358.5 L 638.5 358.5 L 638.5 459.5 L 615.5 459.5 Z M 479.5 358.5 L 502.5 358.5 L 502.5 459.5 L 479.5 459.5 Z M 332.5 363.5 L 355.5 363.5 L 355.5 463.5 L 332.5 463.5 Z M 266.5 363.5 L 289.5 363.5 L 289.5 463.5 L 266.5 463.5 Z M 1160.5 358.5 L 1184.5 358.5 L 1184.5 476.5 L 1160.5 476.5 Z M 1557.5 358.5 L 1580.5 358.5 L 1580.5 515.5 L 1557.5 515.5 Z M 1628.5 358.5 L 1651.5 358.5 L 1651.5 515.5 L 1628.5 515.5 Z M 1628.5 358.5 "/>
 </clipPath>
-<image id="image323" 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="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 304.5 441.5 L 330.5 441.5 L 330.5 468.5 L 304.5 468.5 Z M 1017.5 441.5 L 1044.5 441.5 L 1044.5 468.5 L 1017.5 468.5 Z M 1234.5 441.5 L 1260.5 441.5 L 1260.5 468.5 L 1234.5 468.5 Z M 945.5 601.5 L 972.5 601.5 L 972.5 627.5 L 945.5 627.5 Z M 1240.5 601.5 L 1267.5 601.5 L 1267.5 627.5 L 1240.5 627.5 Z M 366.5 601.5 L 393.5 601.5 L 393.5 627.5 L 366.5 627.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image324" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,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 267.0625 751.957031 L 267.007812 752.808594 L 266.875 753.582031 L 266.636719 754.300781 L 266.316406 754.941406 L 265.890625 755.554688 L 265.382812 756.085938 L 264.824219 756.539062 L 264.238281 756.886719 L 263.570312 757.152344 L 262.878906 757.367188 L 262.132812 757.472656 L 261.332031 757.5 L 252.566406 757.5 L 252.566406 738.074219 L 260.453125 738.074219 L 261.597656 738.152344 L 262.613281 738.339844 L 263.519531 738.660156 L 264.292969 739.113281 L 264.957031 739.699219 L 265.488281 740.417969 L 265.703125 740.820312 L 265.890625 741.246094 L 266.023438 741.644531 L 266.128906 742.097656 L 266.183594 742.550781 L 266.210938 743.003906 L 266.128906 743.960938 L 265.890625 744.789062 L 265.515625 745.5625 L 264.984375 746.203125 L 264.316406 746.789062 L 263.519531 747.242188 L 264.292969 747.585938 L 264.957031 747.960938 L 265.542969 748.386719 L 266.023438 748.867188 L 266.394531 749.371094 L 266.6875 749.90625 L 266.796875 750.226562 L 266.875 750.542969 L 266.957031 750.863281 L 267.007812 751.238281 L 267.035156 751.585938 Z M 263.730469 743.351562 L 263.652344 742.550781 L 263.410156 741.882812 L 263.039062 741.296875 L 262.503906 740.871094 L 261.839844 740.550781 L 261.011719 740.339844 L 260.828125 740.339844 L 260.453125 740.285156 L 260.027344 740.285156 L 259.839844 740.257812 L 255.042969 740.257812 L 255.042969 746.441406 L 259.839844 746.441406 L 260.828125 746.386719 L 261.679688 746.226562 L 262.398438 745.933594 L 262.933594 745.535156 L 263.359375 745.003906 L 263.625 744.363281 L 263.652344 744.230469 L 263.679688 744.070312 L 263.703125 743.910156 L 263.703125 743.535156 Z M 261.09375 755.316406 L 261.839844 755.289062 L 262.503906 755.128906 L 263.09375 754.863281 L 263.570312 754.515625 L 263.972656 754.0625 L 264.292969 753.503906 L 264.371094 753.289062 L 264.425781 753.050781 L 264.503906 752.785156 L 264.53125 752.542969 L 264.558594 752.277344 L 264.585938 751.984375 L 264.53125 751.398438 L 264.425781 750.839844 L 264.238281 750.359375 L 263.972656 749.90625 L 263.625 749.53125 L 263.226562 749.1875 L 262.933594 749.027344 L 262.613281 748.894531 L 262.265625 748.785156 L 261.894531 748.707031 L 261.492188 748.652344 L 261.09375 748.625 L 255.042969 748.625 L 255.042969 755.316406 Z M 261.09375 755.316406 "/>
 <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 239 328 L 239 335 M 235 332 L 242 332 " 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 239 332 L 239 332 M 239 332 L 239 332 M 239 332 L 239 332 M 239 332 L 239 332 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.svg b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.svg
index 46b073f..9ce430f 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <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="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1631.5 605.5 L 1654.5 605.5 L 1654.5 702.5 L 1631.5 702.5 Z M 955.5 649.5 L 977.5 649.5 L 977.5 702.5 L 955.5 702.5 Z M 883.5 649.5 L 905.5 649.5 L 905.5 702.5 L 883.5 702.5 Z M 1212.5 649.5 L 1235.5 649.5 L 1235.5 702.5 L 1212.5 702.5 Z M 1289.5 649.5 L 1312.5 649.5 L 1312.5 702.5 L 1289.5 702.5 Z M 1360.5 640.5 L 1383.5 640.5 L 1383.5 702.5 L 1360.5 702.5 Z M 325.5 640.5 L 347.5 640.5 L 347.5 702.5 L 325.5 702.5 Z M 602.5 640.5 L 624.5 640.5 L 624.5 702.5 L 602.5 702.5 Z M 1028.5 640.5 L 1050.5 640.5 L 1050.5 702.5 L 1028.5 702.5 Z M 544.5 640.5 L 566.5 640.5 L 566.5 702.5 L 544.5 702.5 Z M 468.5 640.5 L 491.5 640.5 L 491.5 702.5 L 468.5 702.5 Z M 730.5 640.5 L 753.5 640.5 L 753.5 702.5 L 730.5 702.5 Z M 674.5 640.5 L 696.5 640.5 L 696.5 702.5 L 674.5 702.5 Z M 262.5 640.5 L 284.5 640.5 L 284.5 702.5 L 262.5 702.5 Z M 1137.5 607.5 L 1159.5 607.5 L 1159.5 702.5 L 1137.5 702.5 Z M 1569.5 605.5 L 1591.5 605.5 L 1591.5 702.5 L 1569.5 702.5 Z M 1501.5 605.5 L 1523.5 605.5 L 1523.5 702.5 L 1501.5 702.5 Z M 1501.5 605.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1343.5 366.5 L 1365.5 366.5 L 1365.5 429.5 L 1343.5 429.5 Z M 1256.5 366.5 L 1278.5 366.5 L 1278.5 429.5 L 1256.5 429.5 Z M 1023.5 366.5 L 1046.5 366.5 L 1046.5 429.5 L 1023.5 429.5 Z M 952.5 366.5 L 974.5 366.5 L 974.5 429.5 L 952.5 429.5 Z M 882.5 366.5 L 904.5 366.5 L 904.5 429.5 L 882.5 429.5 Z M 1193.5 366.5 L 1215.5 366.5 L 1215.5 429.5 L 1193.5 429.5 Z M 466.5 366.5 L 488.5 366.5 L 488.5 462.5 L 466.5 462.5 Z M 730.5 366.5 L 753.5 366.5 L 753.5 462.5 L 730.5 462.5 Z M 598.5 366.5 L 621.5 366.5 L 621.5 462.5 L 598.5 462.5 Z M 661.5 366.5 L 683.5 366.5 L 683.5 462.5 L 661.5 462.5 Z M 529.5 366.5 L 552.5 366.5 L 552.5 462.5 L 529.5 462.5 Z M 326.5 371.5 L 348.5 371.5 L 348.5 466.5 L 326.5 466.5 Z M 263.5 371.5 L 285.5 371.5 L 285.5 466.5 L 263.5 466.5 Z M 1122.5 366.5 L 1144.5 366.5 L 1144.5 478.5 L 1122.5 478.5 Z M 1501.5 366.5 L 1523.5 366.5 L 1523.5 516.5 L 1501.5 516.5 Z M 1569.5 366.5 L 1591.5 366.5 L 1591.5 516.5 L 1569.5 516.5 Z M 1631.5 366.5 L 1654.5 366.5 L 1654.5 516.5 L 1631.5 516.5 Z M 1631.5 366.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 981.5 445.5 L 1006.5 445.5 L 1006.5 465.5 L 981.5 465.5 Z M 981.5 465.5 L 1006.5 465.5 L 1006.5 471.5 L 981.5 471.5 Z M 299.5 445.5 L 324.5 445.5 L 324.5 471.5 L 299.5 471.5 Z M 1192.5 445.5 L 1218.5 445.5 L 1218.5 471.5 L 1192.5 471.5 Z M 912.5 598.5 L 937.5 598.5 L 937.5 623.5 L 912.5 623.5 Z M 1194.5 598.5 L 1219.5 598.5 L 1219.5 623.5 L 1194.5 623.5 Z M 360.5 598.5 L 385.5 598.5 L 385.5 623.5 L 360.5 623.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <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 237 744 L 237 751 M 233 748 L 240 748 " 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 237 748 L 237 748 M 237 748 L 237 748 M 237 748 L 237 748 M 237 748 L 237 748 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 775 583 L 800 583 M 775 557 L 800 557 M 775 557 L 775 583 M 800 557 L 800 583 M 225 583 L 250 583 M 225 557 L 250 557 M 225 557 L 225 583 M 250 557 L 250 583 M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.svg b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.svg
index 4b1f954..d6aab32 100644
--- a/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hd__sdfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 321.5 L 1744.5 321.5 L 1744.5 542.5 L 174.5 542.5 Z M 174.5 321.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image344" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 220.5 709.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1395.5 599.5 L 1415.5 599.5 L 1415.5 689.5 L 1395.5 689.5 Z M 826.5 639.5 L 847.5 639.5 L 847.5 689.5 L 826.5 689.5 Z M 1129.5 639.5 L 1150.5 639.5 L 1150.5 689.5 L 1129.5 689.5 Z M 892.5 639.5 L 913.5 639.5 L 913.5 689.5 L 892.5 689.5 Z M 1200.5 639.5 L 1221.5 639.5 L 1221.5 689.5 L 1200.5 689.5 Z M 255.5 631.5 L 275.5 631.5 L 275.5 689.5 L 255.5 689.5 Z M 1265.5 631.5 L 1286.5 631.5 L 1286.5 689.5 L 1265.5 689.5 Z M 312.5 631.5 L 333.5 631.5 L 333.5 689.5 L 312.5 689.5 Z M 514.5 631.5 L 535.5 631.5 L 535.5 689.5 L 514.5 689.5 Z M 686.5 631.5 L 707.5 631.5 L 707.5 689.5 L 686.5 689.5 Z M 960.5 631.5 L 980.5 631.5 L 980.5 689.5 L 960.5 689.5 Z M 444.5 631.5 L 465.5 631.5 L 465.5 689.5 L 444.5 689.5 Z M 568.5 631.5 L 589.5 631.5 L 589.5 689.5 L 568.5 689.5 Z M 634.5 631.5 L 655.5 631.5 L 655.5 689.5 L 634.5 689.5 Z M 1060.5 601.5 L 1081.5 601.5 L 1081.5 689.5 L 1060.5 689.5 Z M 1634.5 599.5 L 1655.5 599.5 L 1655.5 689.5 L 1634.5 689.5 Z M 1577.5 599.5 L 1597.5 599.5 L 1597.5 689.5 L 1577.5 689.5 Z M 1518.5 599.5 L 1538.5 599.5 L 1538.5 689.5 L 1518.5 689.5 Z M 1460.5 599.5 L 1480.5 599.5 L 1480.5 689.5 L 1460.5 689.5 Z M 1460.5 599.5 "/>
 </clipPath>
-<image id="image317" 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="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1250.5 379.5 L 1270.5 379.5 L 1270.5 437.5 L 1250.5 437.5 Z M 1111.5 379.5 L 1132.5 379.5 L 1132.5 437.5 L 1111.5 437.5 Z M 956.5 379.5 L 976.5 379.5 L 976.5 437.5 L 956.5 437.5 Z M 890.5 379.5 L 910.5 379.5 L 910.5 437.5 L 890.5 437.5 Z M 1169.5 379.5 L 1190.5 379.5 L 1190.5 437.5 L 1169.5 437.5 Z M 826.5 379.5 L 846.5 379.5 L 846.5 437.5 L 826.5 437.5 Z M 500.5 379.5 L 521.5 379.5 L 521.5 467.5 L 500.5 467.5 Z M 442.5 379.5 L 463.5 379.5 L 463.5 467.5 L 442.5 467.5 Z M 565.5 379.5 L 585.5 379.5 L 585.5 467.5 L 565.5 467.5 Z M 686.5 379.5 L 707.5 379.5 L 707.5 467.5 L 686.5 467.5 Z M 622.5 379.5 L 643.5 379.5 L 643.5 467.5 L 622.5 467.5 Z M 313.5 384.5 L 334.5 384.5 L 334.5 472.5 L 313.5 472.5 Z M 255.5 384.5 L 276.5 384.5 L 276.5 472.5 L 255.5 472.5 Z M 1046.5 379.5 L 1067.5 379.5 L 1067.5 483.5 L 1046.5 483.5 Z M 1518.5 379.5 L 1538.5 379.5 L 1538.5 517.5 L 1518.5 517.5 Z M 1634.5 379.5 L 1655.5 379.5 L 1655.5 517.5 L 1634.5 517.5 Z M 1460.5 379.5 L 1480.5 379.5 L 1480.5 517.5 L 1460.5 517.5 Z M 1395.5 379.5 L 1415.5 379.5 L 1415.5 517.5 L 1395.5 517.5 Z M 1577.5 379.5 L 1597.5 379.5 L 1597.5 517.5 L 1577.5 517.5 Z M 1577.5 379.5 "/>
 </clipPath>
-<image id="image318" 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="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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 336.5 L 244.5 336.5 L 244.5 359.5 L 220.5 359.5 Z M 1674.5 336.5 L 1698.5 336.5 L 1698.5 359.5 L 1674.5 359.5 Z M 1611.5 336.5 L 1634.5 336.5 L 1634.5 359.5 L 1611.5 359.5 Z M 1548.5 336.5 L 1571.5 336.5 L 1571.5 359.5 L 1548.5 359.5 Z M 1485.5 336.5 L 1508.5 336.5 L 1508.5 359.5 L 1485.5 359.5 Z M 1421.5 336.5 L 1445.5 336.5 L 1445.5 359.5 L 1421.5 359.5 Z M 1358.5 336.5 L 1381.5 336.5 L 1381.5 359.5 L 1358.5 359.5 Z M 1295.5 336.5 L 1318.5 336.5 L 1318.5 359.5 L 1295.5 359.5 Z M 1232.5 336.5 L 1255.5 336.5 L 1255.5 359.5 L 1232.5 359.5 Z M 1168.5 336.5 L 1192.5 336.5 L 1192.5 359.5 L 1168.5 359.5 Z M 1105.5 336.5 L 1129.5 336.5 L 1129.5 359.5 L 1105.5 359.5 Z M 1042.5 336.5 L 1065.5 336.5 L 1065.5 359.5 L 1042.5 359.5 Z M 979.5 336.5 L 1002.5 336.5 L 1002.5 359.5 L 979.5 359.5 Z M 916.5 336.5 L 939.5 336.5 L 939.5 359.5 L 916.5 359.5 Z M 852.5 336.5 L 876.5 336.5 L 876.5 359.5 L 852.5 359.5 Z M 789.5 336.5 L 813.5 336.5 L 813.5 359.5 L 789.5 359.5 Z M 726.5 336.5 L 749.5 336.5 L 749.5 359.5 L 726.5 359.5 Z M 663.5 336.5 L 686.5 336.5 L 686.5 359.5 L 663.5 359.5 Z M 600.5 336.5 L 623.5 336.5 L 623.5 359.5 L 600.5 359.5 Z M 536.5 336.5 L 560.5 336.5 L 560.5 359.5 L 536.5 359.5 Z M 473.5 336.5 L 497.5 336.5 L 497.5 359.5 L 473.5 359.5 Z M 410.5 336.5 L 433.5 336.5 L 433.5 359.5 L 410.5 359.5 Z M 347.5 336.5 L 370.5 336.5 L 370.5 359.5 L 347.5 359.5 Z M 284.5 336.5 L 307.5 336.5 L 307.5 359.5 L 284.5 359.5 Z M 917.5 452.5 L 940.5 452.5 L 940.5 470.5 L 917.5 470.5 Z M 917.5 470.5 L 940.5 470.5 L 940.5 476.5 L 917.5 476.5 Z M 285.5 452.5 L 308.5 452.5 L 308.5 476.5 L 285.5 476.5 Z M 1111.5 452.5 L 1134.5 452.5 L 1134.5 476.5 L 1111.5 476.5 Z M 854.5 592.5 L 877.5 592.5 L 877.5 616.5 L 854.5 616.5 Z M 1111.5 592.5 L 1134.5 592.5 L 1134.5 616.5 L 1111.5 616.5 Z M 345.5 592.5 L 369.5 592.5 L 369.5 616.5 L 345.5 616.5 Z M 220.5 709.5 L 244.5 709.5 L 244.5 733.5 L 220.5 733.5 Z M 1674.5 709.5 L 1698.5 709.5 L 1698.5 733.5 L 1674.5 733.5 Z M 1611.5 709.5 L 1634.5 709.5 L 1634.5 733.5 L 1611.5 733.5 Z M 1548.5 709.5 L 1571.5 709.5 L 1571.5 733.5 L 1548.5 733.5 Z M 1485.5 709.5 L 1508.5 709.5 L 1508.5 733.5 L 1485.5 733.5 Z M 1421.5 709.5 L 1445.5 709.5 L 1445.5 733.5 L 1421.5 733.5 Z M 1358.5 709.5 L 1381.5 709.5 L 1381.5 733.5 L 1358.5 733.5 Z M 1295.5 709.5 L 1318.5 709.5 L 1318.5 733.5 L 1295.5 733.5 Z M 1232.5 709.5 L 1255.5 709.5 L 1255.5 733.5 L 1232.5 733.5 Z M 1168.5 709.5 L 1192.5 709.5 L 1192.5 733.5 L 1168.5 733.5 Z M 1105.5 709.5 L 1129.5 709.5 L 1129.5 733.5 L 1105.5 733.5 Z M 1042.5 709.5 L 1065.5 709.5 L 1065.5 733.5 L 1042.5 733.5 Z M 979.5 709.5 L 1002.5 709.5 L 1002.5 733.5 L 979.5 733.5 Z M 916.5 709.5 L 939.5 709.5 L 939.5 733.5 L 916.5 733.5 Z M 852.5 709.5 L 876.5 709.5 L 876.5 733.5 L 852.5 733.5 Z M 789.5 709.5 L 813.5 709.5 L 813.5 733.5 L 789.5 733.5 Z M 726.5 709.5 L 749.5 709.5 L 749.5 733.5 L 726.5 733.5 Z M 663.5 709.5 L 686.5 709.5 L 686.5 733.5 L 663.5 733.5 Z M 600.5 709.5 L 623.5 709.5 L 623.5 733.5 L 600.5 733.5 Z M 536.5 709.5 L 560.5 709.5 L 560.5 733.5 L 536.5 733.5 Z M 473.5 709.5 L 497.5 709.5 L 497.5 733.5 L 473.5 733.5 Z M 410.5 709.5 L 433.5 709.5 L 433.5 733.5 L 410.5 733.5 Z M 347.5 709.5 L 370.5 709.5 L 370.5 733.5 L 347.5 733.5 Z M 284.5 709.5 L 307.5 709.5 L 307.5 733.5 L 284.5 733.5 Z M 284.5 709.5 "/>
 </clipPath>
-<image id="image319" 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="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,5 @@
 <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 232 728 L 232 735 M 228 732 L 235 732 " 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 232 732 L 232 732 M 232 732 L 232 732 M 232 732 L 232 732 M 232 732 L 232 732 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 200 355 L 200 360 M 197 358 L 202 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 200 353 L 200 362 M 195 358 L 204 358 M 199 359 L 201 359 M 199 357 L 201 357 M 199 357 L 199 359 M 201 357 L 201 359 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.svg b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.svg
index 9fa22a3..bcab331 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 201.5 L 1744.5 201.5 L 1744.5 547.5 L 174.5 547.5 Z M 174.5 201.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image376" 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="#image376"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 247.5 810.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1585.5 638.5 L 1617.5 638.5 L 1617.5 778.5 L 1585.5 778.5 Z M 494.5 700.5 L 527.5 700.5 L 527.5 778.5 L 494.5 778.5 Z M 608.5 700.5 L 640.5 700.5 L 640.5 778.5 L 608.5 778.5 Z M 1362.5 687.5 L 1394.5 687.5 L 1394.5 778.5 L 1362.5 778.5 Z M 1159.5 687.5 L 1192.5 687.5 L 1192.5 778.5 L 1159.5 778.5 Z M 1069.5 687.5 L 1101.5 687.5 L 1101.5 778.5 L 1069.5 778.5 Z M 391.5 687.5 L 423.5 687.5 L 423.5 778.5 L 391.5 778.5 Z M 739.5 687.5 L 771.5 687.5 L 771.5 778.5 L 739.5 778.5 Z M 1483.5 687.5 L 1515.5 687.5 L 1515.5 778.5 L 1483.5 778.5 Z M 300.5 687.5 L 333.5 687.5 L 333.5 778.5 L 300.5 778.5 Z M 866.5 638.5 L 899.5 638.5 L 899.5 778.5 L 866.5 778.5 Z M 866.5 638.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 491.5 293.5 L 524.5 293.5 L 524.5 383.5 L 491.5 383.5 Z M 595.5 293.5 L 627.5 293.5 L 627.5 383.5 L 595.5 383.5 Z M 722.5 293.5 L 754.5 293.5 L 754.5 383.5 L 722.5 383.5 Z M 1392.5 293.5 L 1425.5 293.5 L 1425.5 431.5 L 1392.5 431.5 Z M 378.5 293.5 L 410.5 293.5 L 410.5 431.5 L 378.5 431.5 Z M 1483.5 293.5 L 1515.5 293.5 L 1515.5 431.5 L 1483.5 431.5 Z M 300.5 293.5 L 333.5 293.5 L 333.5 431.5 L 300.5 431.5 Z M 1069.5 364.5 L 1101.5 364.5 L 1101.5 502.5 L 1069.5 502.5 Z M 1187.5 364.5 L 1220.5 364.5 L 1220.5 502.5 L 1187.5 502.5 Z M 868.5 293.5 L 901.5 293.5 L 901.5 508.5 L 868.5 508.5 Z M 1585.5 293.5 L 1617.5 293.5 L 1617.5 508.5 L 1585.5 508.5 Z M 1585.5 293.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 247.5 224.5 L 283.5 224.5 L 283.5 260.5 L 247.5 260.5 Z M 1635.5 224.5 L 1671.5 224.5 L 1671.5 260.5 L 1635.5 260.5 Z M 1536.5 224.5 L 1572.5 224.5 L 1572.5 260.5 L 1536.5 260.5 Z M 1436.5 224.5 L 1473.5 224.5 L 1473.5 260.5 L 1436.5 260.5 Z M 1337.5 224.5 L 1374.5 224.5 L 1374.5 260.5 L 1337.5 260.5 Z M 1238.5 224.5 L 1275.5 224.5 L 1275.5 260.5 L 1238.5 260.5 Z M 1139.5 224.5 L 1176.5 224.5 L 1176.5 260.5 L 1139.5 260.5 Z M 1040.5 224.5 L 1076.5 224.5 L 1076.5 260.5 L 1040.5 260.5 Z M 941.5 224.5 L 977.5 224.5 L 977.5 260.5 L 941.5 260.5 Z M 841.5 224.5 L 878.5 224.5 L 878.5 260.5 L 841.5 260.5 Z M 742.5 224.5 L 779.5 224.5 L 779.5 260.5 L 742.5 260.5 Z M 643.5 224.5 L 680.5 224.5 L 680.5 260.5 L 643.5 260.5 Z M 544.5 224.5 L 581.5 224.5 L 581.5 260.5 L 544.5 260.5 Z M 445.5 224.5 L 482.5 224.5 L 482.5 260.5 L 445.5 260.5 Z M 346.5 224.5 L 382.5 224.5 L 382.5 260.5 L 346.5 260.5 Z M 544.5 480.5 L 581.5 480.5 L 581.5 517.5 L 544.5 517.5 Z M 1141.5 480.5 L 1178.5 480.5 L 1178.5 517.5 L 1141.5 517.5 Z M 643.5 627.5 L 680.5 627.5 L 680.5 659.5 L 643.5 659.5 Z M 643.5 659.5 L 680.5 659.5 L 680.5 663.5 L 643.5 663.5 Z M 1042.5 627.5 L 1079.5 627.5 L 1079.5 663.5 L 1042.5 663.5 Z M 247.5 810.5 L 283.5 810.5 L 283.5 847.5 L 247.5 847.5 Z M 1635.5 810.5 L 1671.5 810.5 L 1671.5 847.5 L 1635.5 847.5 Z M 1536.5 810.5 L 1572.5 810.5 L 1572.5 847.5 L 1536.5 847.5 Z M 1436.5 810.5 L 1473.5 810.5 L 1473.5 847.5 L 1436.5 847.5 Z M 1337.5 810.5 L 1374.5 810.5 L 1374.5 847.5 L 1337.5 847.5 Z M 1238.5 810.5 L 1275.5 810.5 L 1275.5 847.5 L 1238.5 847.5 Z M 1139.5 810.5 L 1176.5 810.5 L 1176.5 847.5 L 1139.5 847.5 Z M 1040.5 810.5 L 1076.5 810.5 L 1076.5 847.5 L 1040.5 847.5 Z M 941.5 810.5 L 977.5 810.5 L 977.5 847.5 L 941.5 847.5 Z M 841.5 810.5 L 878.5 810.5 L 878.5 847.5 L 841.5 847.5 Z M 742.5 810.5 L 779.5 810.5 L 779.5 847.5 L 742.5 847.5 Z M 643.5 810.5 L 680.5 810.5 L 680.5 847.5 L 643.5 847.5 Z M 544.5 810.5 L 581.5 810.5 L 581.5 847.5 L 544.5 847.5 Z M 445.5 810.5 L 482.5 810.5 L 482.5 847.5 L 445.5 847.5 Z M 346.5 810.5 L 382.5 810.5 L 382.5 847.5 L 346.5 847.5 Z M 346.5 810.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image379"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface347">
+<g id="surface373">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <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 247 269 L 283 269 M 247 232 L 283 232 M 247 232 L 247 269 M 283 232 L 283 269 " 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 247 269 L 283 269 M 247 232 L 283 232 M 283 269 L 283 232 M 247 269 L 247 232 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 247 L 215 254 M 211 251 L 218 251 " 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 246 L 215 255 M 210 251 L 219 251 M 214 252 L 216 252 M 214 250 L 216 250 M 214 250 L 214 252 M 216 250 L 216 252 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.svg b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.svg
index 5107b19..3a6c175 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 221.5 L 1743.5 221.5 L 1743.5 546.5 L 174.5 546.5 Z M 174.5 221.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image390" 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="#image390"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 243.5 794.5 L 277.5 794.5 L 277.5 828.5 L 243.5 828.5 Z M 243.5 794.5 "/>
 </clipPath>
 <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;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1594.5 631.5 L 1625.5 631.5 L 1625.5 763.5 L 1594.5 763.5 Z M 582.5 690.5 L 613.5 690.5 L 613.5 763.5 L 582.5 763.5 Z M 476.5 690.5 L 506.5 690.5 L 506.5 763.5 L 476.5 763.5 Z M 1372.5 678.5 L 1402.5 678.5 L 1402.5 763.5 L 1372.5 763.5 Z M 1299.5 678.5 L 1329.5 678.5 L 1329.5 763.5 L 1299.5 763.5 Z M 1103.5 678.5 L 1134.5 678.5 L 1134.5 763.5 L 1103.5 763.5 Z M 1018.5 678.5 L 1049.5 678.5 L 1049.5 763.5 L 1018.5 763.5 Z M 377.5 678.5 L 408.5 678.5 L 408.5 763.5 L 377.5 763.5 Z M 706.5 678.5 L 736.5 678.5 L 736.5 763.5 L 706.5 763.5 Z M 292.5 678.5 L 323.5 678.5 L 323.5 763.5 L 292.5 763.5 Z M 1509.5 631.5 L 1539.5 631.5 L 1539.5 763.5 L 1509.5 763.5 Z M 828.5 631.5 L 858.5 631.5 L 858.5 763.5 L 828.5 763.5 Z M 828.5 631.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <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;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 473.5 307.5 L 503.5 307.5 L 503.5 392.5 L 473.5 392.5 Z M 570.5 307.5 L 600.5 307.5 L 600.5 392.5 L 570.5 392.5 Z M 690.5 307.5 L 720.5 307.5 L 720.5 392.5 L 690.5 392.5 Z M 365.5 307.5 L 396.5 307.5 L 396.5 437.5 L 365.5 437.5 Z M 1327.5 307.5 L 1358.5 307.5 L 1358.5 437.5 L 1327.5 437.5 Z M 1413.5 307.5 L 1443.5 307.5 L 1443.5 437.5 L 1413.5 437.5 Z M 292.5 307.5 L 323.5 307.5 L 323.5 437.5 L 292.5 437.5 Z M 1025.5 374.5 L 1056.5 374.5 L 1056.5 504.5 L 1025.5 504.5 Z M 1137.5 374.5 L 1167.5 374.5 L 1167.5 504.5 L 1137.5 504.5 Z M 1594.5 307.5 L 1625.5 307.5 L 1625.5 510.5 L 1594.5 510.5 Z M 828.5 307.5 L 858.5 307.5 L 858.5 510.5 L 828.5 510.5 Z M 1509.5 307.5 L 1539.5 307.5 L 1539.5 510.5 L 1509.5 510.5 Z M 1509.5 307.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 242.5 242.5 L 276.5 242.5 L 276.5 277.5 L 242.5 277.5 Z M 1641.5 242.5 L 1675.5 242.5 L 1675.5 277.5 L 1641.5 277.5 Z M 1547.5 242.5 L 1582.5 242.5 L 1582.5 277.5 L 1547.5 277.5 Z M 1454.5 242.5 L 1489.5 242.5 L 1489.5 277.5 L 1454.5 277.5 Z M 1361.5 242.5 L 1395.5 242.5 L 1395.5 277.5 L 1361.5 277.5 Z M 1268.5 242.5 L 1302.5 242.5 L 1302.5 277.5 L 1268.5 277.5 Z M 1174.5 242.5 L 1209.5 242.5 L 1209.5 277.5 L 1174.5 277.5 Z M 1081.5 242.5 L 1116.5 242.5 L 1116.5 277.5 L 1081.5 277.5 Z M 988.5 242.5 L 1022.5 242.5 L 1022.5 277.5 L 988.5 277.5 Z M 895.5 242.5 L 929.5 242.5 L 929.5 277.5 L 895.5 277.5 Z M 801.5 242.5 L 836.5 242.5 L 836.5 277.5 L 801.5 277.5 Z M 708.5 242.5 L 742.5 242.5 L 742.5 277.5 L 708.5 277.5 Z M 615.5 242.5 L 649.5 242.5 L 649.5 277.5 L 615.5 277.5 Z M 521.5 242.5 L 556.5 242.5 L 556.5 277.5 L 521.5 277.5 Z M 428.5 242.5 L 463.5 242.5 L 463.5 277.5 L 428.5 277.5 Z M 335.5 242.5 L 369.5 242.5 L 369.5 277.5 L 335.5 277.5 Z M 522.5 483.5 L 557.5 483.5 L 557.5 518.5 L 522.5 518.5 Z M 1082.5 483.5 L 1117.5 483.5 L 1117.5 518.5 L 1082.5 518.5 Z M 616.5 621.5 L 650.5 621.5 L 650.5 652.5 L 616.5 652.5 Z M 616.5 652.5 L 650.5 652.5 L 650.5 656.5 L 616.5 656.5 Z M 989.5 621.5 L 1023.5 621.5 L 1023.5 656.5 L 989.5 656.5 Z M 242.5 794.5 L 276.5 794.5 L 276.5 828.5 L 242.5 828.5 Z M 1641.5 794.5 L 1675.5 794.5 L 1675.5 828.5 L 1641.5 828.5 Z M 1547.5 794.5 L 1582.5 794.5 L 1582.5 828.5 L 1547.5 828.5 Z M 1454.5 794.5 L 1489.5 794.5 L 1489.5 828.5 L 1454.5 828.5 Z M 1361.5 794.5 L 1395.5 794.5 L 1395.5 828.5 L 1361.5 828.5 Z M 1268.5 794.5 L 1302.5 794.5 L 1302.5 828.5 L 1268.5 828.5 Z M 1174.5 794.5 L 1209.5 794.5 L 1209.5 828.5 L 1174.5 828.5 Z M 1081.5 794.5 L 1116.5 794.5 L 1116.5 828.5 L 1081.5 828.5 Z M 988.5 794.5 L 1022.5 794.5 L 1022.5 828.5 L 988.5 828.5 Z M 895.5 794.5 L 929.5 794.5 L 929.5 828.5 L 895.5 828.5 Z M 801.5 794.5 L 836.5 794.5 L 836.5 828.5 L 801.5 828.5 Z M 708.5 794.5 L 742.5 794.5 L 742.5 828.5 L 708.5 828.5 Z M 615.5 794.5 L 649.5 794.5 L 649.5 828.5 L 615.5 828.5 Z M 521.5 794.5 L 556.5 794.5 L 556.5 828.5 L 521.5 828.5 Z M 428.5 794.5 L 463.5 794.5 L 463.5 828.5 L 428.5 828.5 Z M 335.5 794.5 L 369.5 794.5 L 369.5 828.5 L 335.5 828.5 Z M 335.5 794.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <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="#image393"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface387">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,5 @@
 <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 243 285 L 277 285 M 243 251 L 277 251 M 243 251 L 243 285 M 277 251 L 277 285 " 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 243 285 L 277 285 M 243 251 L 277 251 M 277 285 L 277 251 M 243 285 L 243 251 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 212 264 L 212 271 M 208 268 L 215 268 " 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 212 263 L 212 272 M 207 268 L 216 268 M 211 269 L 213 269 M 211 267 L 213 267 M 211 267 L 211 269 M 213 267 L 213 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.svg b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.svg
index 333b857..bbed54a 100644
--- a/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hd__sdlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image462" 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="#image435"/>
+  <use xlink:href="#image462"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 236.5 766.5 L 267.5 766.5 L 267.5 797.5 L 236.5 797.5 Z M 236.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image435"/>
+  <use xlink:href="#image462"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1441.5 621.5 L 1468.5 621.5 L 1468.5 739.5 L 1441.5 739.5 Z M 445.5 673.5 L 472.5 673.5 L 472.5 739.5 L 445.5 739.5 Z M 540.5 673.5 L 567.5 673.5 L 567.5 739.5 L 540.5 739.5 Z M 357.5 662.5 L 384.5 662.5 L 384.5 739.5 L 357.5 739.5 Z M 650.5 662.5 L 677.5 662.5 L 677.5 739.5 L 650.5 739.5 Z M 281.5 662.5 L 308.5 662.5 L 308.5 739.5 L 281.5 739.5 Z M 929.5 662.5 L 957.5 662.5 L 957.5 739.5 L 929.5 739.5 Z M 1005.5 662.5 L 1033.5 662.5 L 1033.5 739.5 L 1005.5 739.5 Z M 1203.5 621.5 L 1230.5 621.5 L 1230.5 739.5 L 1203.5 739.5 Z M 759.5 621.5 L 786.5 621.5 L 786.5 739.5 L 759.5 739.5 Z M 1365.5 621.5 L 1392.5 621.5 L 1392.5 739.5 L 1365.5 739.5 Z M 1268.5 621.5 L 1295.5 621.5 L 1295.5 739.5 L 1268.5 739.5 Z M 1593.5 621.5 L 1621.5 621.5 L 1621.5 739.5 L 1593.5 739.5 Z M 1517.5 621.5 L 1545.5 621.5 L 1545.5 739.5 L 1517.5 739.5 Z M 1517.5 621.5 "/>
 </clipPath>
-<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image436"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 442.5 331.5 L 469.5 331.5 L 469.5 407.5 L 442.5 407.5 Z M 529.5 331.5 L 556.5 331.5 L 556.5 407.5 L 529.5 407.5 Z M 636.5 331.5 L 663.5 331.5 L 663.5 407.5 L 636.5 407.5 Z M 346.5 331.5 L 373.5 331.5 L 373.5 447.5 L 346.5 447.5 Z M 281.5 331.5 L 308.5 331.5 L 308.5 447.5 L 281.5 447.5 Z M 929.5 391.5 L 957.5 391.5 L 957.5 507.5 L 929.5 507.5 Z M 1029.5 391.5 L 1056.5 391.5 L 1056.5 507.5 L 1029.5 507.5 Z M 1593.5 331.5 L 1621.5 331.5 L 1621.5 512.5 L 1593.5 512.5 Z M 1279.5 331.5 L 1306.5 331.5 L 1306.5 512.5 L 1279.5 512.5 Z M 1365.5 331.5 L 1392.5 331.5 L 1392.5 512.5 L 1365.5 512.5 Z M 1517.5 331.5 L 1545.5 331.5 L 1545.5 512.5 L 1517.5 512.5 Z M 759.5 331.5 L 786.5 331.5 L 786.5 512.5 L 759.5 512.5 Z M 1203.5 331.5 L 1230.5 331.5 L 1230.5 512.5 L 1203.5 512.5 Z M 1441.5 331.5 L 1468.5 331.5 L 1468.5 512.5 L 1441.5 512.5 Z M 1441.5 331.5 "/>
 </clipPath>
-<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 486.5 489.5 L 517.5 489.5 L 517.5 519.5 L 486.5 519.5 Z M 990.5 489.5 L 1021.5 489.5 L 1021.5 519.5 L 990.5 519.5 Z M 1073.5 550.5 L 1104.5 550.5 L 1104.5 556.5 L 1073.5 556.5 Z M 1073.5 556.5 L 1104.5 556.5 L 1104.5 581.5 L 1073.5 581.5 Z M 1244.5 550.5 L 1275.5 550.5 L 1275.5 581.5 L 1244.5 581.5 Z M 570.5 612.5 L 600.5 612.5 L 600.5 639.5 L 570.5 639.5 Z M 570.5 639.5 L 600.5 639.5 L 600.5 643.5 L 570.5 643.5 Z M 907.5 612.5 L 938.5 612.5 L 938.5 643.5 L 907.5 643.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image438"/>
+  <use xlink:href="#image465"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface432">
+<g id="surface459">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -221,6 +221,5 @@
 <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 236 313 L 267 313 M 236 282 L 267 282 M 236 282 L 236 313 M 267 282 L 267 313 " 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 236 313 L 267 313 M 236 282 L 267 282 M 267 313 L 267 282 M 236 313 L 236 282 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.svg b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.svg
index 7674679..4b7cc04 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.svg
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 367.5 L 1743.5 367.5 L 1743.5 526.5 L 174.5 526.5 Z M 966.5 526.5 L 1743.5 526.5 L 1743.5 540.5 L 966.5 540.5 Z M 174.5 526.5 L 718.5 526.5 L 718.5 540.5 L 174.5 540.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image529" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image557" 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="#image529"/>
+  <use xlink:href="#image557"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 210.5 670.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image529"/>
+  <use xlink:href="#image557"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 790.5 571.5 L 806.5 571.5 L 806.5 616.5 L 790.5 616.5 Z M 835.5 571.5 L 851.5 571.5 L 851.5 616.5 L 835.5 616.5 Z M 874.5 571.5 L 890.5 571.5 L 890.5 616.5 L 874.5 616.5 Z M 968.5 616.5 L 984.5 616.5 L 984.5 654.5 L 968.5 654.5 Z M 1288.5 616.5 L 1304.5 616.5 L 1304.5 654.5 L 1288.5 654.5 Z M 569.5 609.5 L 585.5 609.5 L 585.5 654.5 L 569.5 654.5 Z M 1396.5 609.5 L 1412.5 609.5 L 1412.5 654.5 L 1396.5 654.5 Z M 1236.5 609.5 L 1252.5 609.5 L 1252.5 654.5 L 1236.5 654.5 Z M 382.5 609.5 L 398.5 609.5 L 398.5 654.5 L 382.5 654.5 Z M 1072.5 609.5 L 1088.5 609.5 L 1088.5 654.5 L 1072.5 654.5 Z M 1578.5 609.5 L 1594.5 609.5 L 1594.5 654.5 L 1578.5 654.5 Z M 421.5 609.5 L 437.5 609.5 L 437.5 654.5 L 421.5 654.5 Z M 522.5 609.5 L 538.5 609.5 L 538.5 654.5 L 522.5 654.5 Z M 282.5 609.5 L 298.5 609.5 L 298.5 654.5 L 282.5 654.5 Z M 236.5 609.5 L 253.5 609.5 L 253.5 654.5 L 236.5 654.5 Z M 668.5 609.5 L 685.5 609.5 L 685.5 654.5 L 668.5 654.5 Z M 623.5 609.5 L 640.5 609.5 L 640.5 654.5 L 623.5 654.5 Z M 1135.5 586.5 L 1151.5 586.5 L 1151.5 654.5 L 1135.5 654.5 Z M 1630.5 585.5 L 1646.5 585.5 L 1646.5 654.5 L 1630.5 654.5 Z M 1448.5 585.5 L 1464.5 585.5 L 1464.5 654.5 L 1448.5 654.5 Z M 1015.5 616.5 L 1031.5 616.5 L 1031.5 654.5 L 1015.5 654.5 Z M 1345.5 616.5 L 1361.5 616.5 L 1361.5 654.5 L 1345.5 654.5 Z M 1345.5 616.5 "/>
 </clipPath>
-<image id="image530" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image558" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image530"/>
+  <use xlink:href="#image558"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1383.5 413.5 L 1400.5 413.5 L 1400.5 458.5 L 1383.5 458.5 Z M 1322.5 413.5 L 1338.5 413.5 L 1338.5 458.5 L 1322.5 458.5 Z M 1057.5 413.5 L 1073.5 413.5 L 1073.5 458.5 L 1057.5 458.5 Z M 1002.5 413.5 L 1018.5 413.5 L 1018.5 458.5 L 1002.5 458.5 Z M 953.5 413.5 L 969.5 413.5 L 969.5 458.5 L 953.5 458.5 Z M 1277.5 413.5 L 1293.5 413.5 L 1293.5 458.5 L 1277.5 458.5 Z M 1229.5 413.5 L 1245.5 413.5 L 1245.5 458.5 L 1229.5 458.5 Z M 421.5 413.5 L 437.5 413.5 L 437.5 482.5 L 421.5 482.5 Z M 673.5 413.5 L 689.5 413.5 L 689.5 482.5 L 673.5 482.5 Z M 623.5 413.5 L 640.5 413.5 L 640.5 482.5 L 623.5 482.5 Z M 569.5 413.5 L 585.5 413.5 L 585.5 482.5 L 569.5 482.5 Z M 522.5 413.5 L 538.5 413.5 L 538.5 482.5 L 522.5 482.5 Z M 382.5 413.5 L 398.5 413.5 L 398.5 482.5 L 382.5 482.5 Z M 1578.5 413.5 L 1594.5 413.5 L 1594.5 482.5 L 1578.5 482.5 Z M 889.5 413.5 L 905.5 413.5 L 905.5 482.5 L 889.5 482.5 Z M 838.5 413.5 L 854.5 413.5 L 854.5 482.5 L 838.5 482.5 Z M 779.5 413.5 L 796.5 413.5 L 796.5 482.5 L 779.5 482.5 Z M 236.5 416.5 L 253.5 416.5 L 253.5 485.5 L 236.5 485.5 Z M 282.5 416.5 L 298.5 416.5 L 298.5 485.5 L 282.5 485.5 Z M 1128.5 413.5 L 1144.5 413.5 L 1144.5 493.5 L 1128.5 493.5 Z M 1630.5 413.5 L 1646.5 413.5 L 1646.5 520.5 L 1630.5 520.5 Z M 1435.5 413.5 L 1452.5 413.5 L 1452.5 520.5 L 1435.5 520.5 Z M 1435.5 413.5 "/>
 </clipPath>
-<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image559" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image531"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 210.5 379.5 L 228.5 379.5 L 228.5 397.5 L 210.5 397.5 Z M 1689.5 379.5 L 1707.5 379.5 L 1707.5 397.5 L 1689.5 397.5 Z M 1640.5 379.5 L 1658.5 379.5 L 1658.5 397.5 L 1640.5 397.5 Z M 1590.5 379.5 L 1609.5 379.5 L 1609.5 397.5 L 1590.5 397.5 Z M 1541.5 379.5 L 1559.5 379.5 L 1559.5 397.5 L 1541.5 397.5 Z M 1492.5 379.5 L 1510.5 379.5 L 1510.5 397.5 L 1492.5 397.5 Z M 1442.5 379.5 L 1461.5 379.5 L 1461.5 397.5 L 1442.5 397.5 Z M 1393.5 379.5 L 1411.5 379.5 L 1411.5 397.5 L 1393.5 397.5 Z M 1344.5 379.5 L 1362.5 379.5 L 1362.5 397.5 L 1344.5 397.5 Z M 1295.5 379.5 L 1313.5 379.5 L 1313.5 397.5 L 1295.5 397.5 Z M 1245.5 379.5 L 1263.5 379.5 L 1263.5 397.5 L 1245.5 397.5 Z M 1196.5 379.5 L 1214.5 379.5 L 1214.5 397.5 L 1196.5 397.5 Z M 1147.5 379.5 L 1165.5 379.5 L 1165.5 397.5 L 1147.5 397.5 Z M 1097.5 379.5 L 1116.5 379.5 L 1116.5 397.5 L 1097.5 397.5 Z M 1048.5 379.5 L 1066.5 379.5 L 1066.5 397.5 L 1048.5 397.5 Z M 999.5 379.5 L 1017.5 379.5 L 1017.5 397.5 L 999.5 397.5 Z M 949.5 379.5 L 968.5 379.5 L 968.5 397.5 L 949.5 397.5 Z M 900.5 379.5 L 918.5 379.5 L 918.5 397.5 L 900.5 397.5 Z M 851.5 379.5 L 869.5 379.5 L 869.5 397.5 L 851.5 397.5 Z M 801.5 379.5 L 820.5 379.5 L 820.5 397.5 L 801.5 397.5 Z M 752.5 379.5 L 770.5 379.5 L 770.5 397.5 L 752.5 397.5 Z M 703.5 379.5 L 721.5 379.5 L 721.5 397.5 L 703.5 397.5 Z M 653.5 379.5 L 672.5 379.5 L 672.5 397.5 L 653.5 397.5 Z M 604.5 379.5 L 622.5 379.5 L 622.5 397.5 L 604.5 397.5 Z M 555.5 379.5 L 573.5 379.5 L 573.5 397.5 L 555.5 397.5 Z M 506.5 379.5 L 524.5 379.5 L 524.5 397.5 L 506.5 397.5 Z M 456.5 379.5 L 474.5 379.5 L 474.5 397.5 L 456.5 397.5 Z M 407.5 379.5 L 425.5 379.5 L 425.5 397.5 L 407.5 397.5 Z M 358.5 379.5 L 376.5 379.5 L 376.5 397.5 L 358.5 397.5 Z M 308.5 379.5 L 327.5 379.5 L 327.5 397.5 L 308.5 397.5 Z M 259.5 379.5 L 277.5 379.5 L 277.5 397.5 L 259.5 397.5 Z M 1505.5 470.5 L 1523.5 470.5 L 1523.5 484.5 L 1505.5 484.5 Z M 999.5 470.5 L 1017.5 470.5 L 1017.5 484.5 L 999.5 484.5 Z M 999.5 484.5 L 1017.5 484.5 L 1017.5 488.5 L 999.5 488.5 Z M 262.5 470.5 L 280.5 470.5 L 280.5 488.5 L 262.5 488.5 Z M 1277.5 470.5 L 1295.5 470.5 L 1295.5 488.5 L 1277.5 488.5 Z M 1371.5 470.5 L 1389.5 470.5 L 1389.5 488.5 L 1371.5 488.5 Z M 1505.5 484.5 L 1523.5 484.5 L 1523.5 488.5 L 1505.5 488.5 Z M 303.5 506.5 L 321.5 506.5 L 321.5 524.5 L 303.5 524.5 Z M 1322.5 506.5 L 1340.5 506.5 L 1340.5 524.5 L 1322.5 524.5 Z M 955.5 506.5 L 973.5 506.5 L 973.5 524.5 L 955.5 524.5 Z M 602.5 579.5 L 620.5 579.5 L 620.5 597.5 L 602.5 597.5 Z M 1554.5 579.5 L 1573.5 579.5 L 1573.5 597.5 L 1554.5 597.5 Z M 643.5 616.5 L 661.5 616.5 L 661.5 623.5 L 643.5 623.5 Z M 689.5 616.5 L 707.5 616.5 L 707.5 623.5 L 689.5 623.5 Z M 643.5 623.5 L 661.5 623.5 L 661.5 634.5 L 643.5 634.5 Z M 689.5 623.5 L 707.5 623.5 L 707.5 634.5 L 689.5 634.5 Z M 894.5 616.5 L 912.5 616.5 L 912.5 634.5 L 894.5 634.5 Z M 339.5 616.5 L 358.5 616.5 L 358.5 634.5 L 339.5 634.5 Z M 210.5 670.5 L 228.5 670.5 L 228.5 689.5 L 210.5 689.5 Z M 1689.5 670.5 L 1707.5 670.5 L 1707.5 689.5 L 1689.5 689.5 Z M 1640.5 670.5 L 1658.5 670.5 L 1658.5 689.5 L 1640.5 689.5 Z M 1590.5 670.5 L 1609.5 670.5 L 1609.5 689.5 L 1590.5 689.5 Z M 1541.5 670.5 L 1559.5 670.5 L 1559.5 689.5 L 1541.5 689.5 Z M 1492.5 670.5 L 1510.5 670.5 L 1510.5 689.5 L 1492.5 689.5 Z M 1442.5 670.5 L 1461.5 670.5 L 1461.5 689.5 L 1442.5 689.5 Z M 1393.5 670.5 L 1411.5 670.5 L 1411.5 689.5 L 1393.5 689.5 Z M 1344.5 670.5 L 1362.5 670.5 L 1362.5 689.5 L 1344.5 689.5 Z M 1295.5 670.5 L 1313.5 670.5 L 1313.5 689.5 L 1295.5 689.5 Z M 1245.5 670.5 L 1263.5 670.5 L 1263.5 689.5 L 1245.5 689.5 Z M 1196.5 670.5 L 1214.5 670.5 L 1214.5 689.5 L 1196.5 689.5 Z M 1147.5 670.5 L 1165.5 670.5 L 1165.5 689.5 L 1147.5 689.5 Z M 1097.5 670.5 L 1116.5 670.5 L 1116.5 689.5 L 1097.5 689.5 Z M 1048.5 670.5 L 1066.5 670.5 L 1066.5 689.5 L 1048.5 689.5 Z M 999.5 670.5 L 1017.5 670.5 L 1017.5 689.5 L 999.5 689.5 Z M 949.5 670.5 L 968.5 670.5 L 968.5 689.5 L 949.5 689.5 Z M 900.5 670.5 L 918.5 670.5 L 918.5 689.5 L 900.5 689.5 Z M 851.5 670.5 L 869.5 670.5 L 869.5 689.5 L 851.5 689.5 Z M 801.5 670.5 L 820.5 670.5 L 820.5 689.5 L 801.5 689.5 Z M 752.5 670.5 L 770.5 670.5 L 770.5 689.5 L 752.5 689.5 Z M 703.5 670.5 L 721.5 670.5 L 721.5 689.5 L 703.5 689.5 Z M 653.5 670.5 L 672.5 670.5 L 672.5 689.5 L 653.5 689.5 Z M 604.5 670.5 L 622.5 670.5 L 622.5 689.5 L 604.5 689.5 Z M 555.5 670.5 L 573.5 670.5 L 573.5 689.5 L 555.5 689.5 Z M 506.5 670.5 L 524.5 670.5 L 524.5 689.5 L 506.5 689.5 Z M 456.5 670.5 L 474.5 670.5 L 474.5 689.5 L 456.5 689.5 Z M 407.5 670.5 L 425.5 670.5 L 425.5 689.5 L 407.5 689.5 Z M 358.5 670.5 L 376.5 670.5 L 376.5 689.5 L 358.5 689.5 Z M 308.5 670.5 L 327.5 670.5 L 327.5 689.5 L 308.5 689.5 Z M 259.5 670.5 L 277.5 670.5 L 277.5 689.5 L 259.5 689.5 Z M 259.5 670.5 "/>
 </clipPath>
-<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image560" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image532"/>
+  <use xlink:href="#image560"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface526">
+<g id="surface554">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -242,6 +242,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 237.148438 682.707031 L 237.113281 683.292969 L 237.019531 683.820312 L 236.855469 684.3125 L 236.636719 684.75 L 236.347656 685.167969 L 236 685.535156 L 235.617188 685.84375 L 235.214844 686.082031 L 234.757812 686.261719 L 234.285156 686.410156 L 233.773438 686.480469 L 233.226562 686.5 L 227.230469 686.5 L 227.230469 673.207031 L 232.625 673.207031 L 233.410156 673.261719 L 234.101562 673.390625 L 234.722656 673.609375 L 235.25 673.917969 L 235.707031 674.320312 L 236.070312 674.8125 L 236.21875 675.085938 L 236.347656 675.378906 L 236.4375 675.652344 L 236.511719 675.960938 L 236.546875 676.269531 L 236.566406 676.582031 L 236.511719 677.238281 L 236.347656 677.804688 L 236.089844 678.332031 L 235.726562 678.769531 L 235.269531 679.171875 L 234.722656 679.480469 L 235.25 679.71875 L 235.707031 679.972656 L 236.109375 680.265625 L 236.4375 680.59375 L 236.691406 680.9375 L 236.894531 681.304688 L 236.964844 681.523438 L 237.074219 681.960938 L 237.113281 682.214844 L 237.128906 682.453125 Z M 234.867188 676.820312 L 234.8125 676.269531 L 234.648438 675.816406 L 234.394531 675.414062 L 234.03125 675.121094 L 233.574219 674.902344 L 233.007812 674.757812 L 232.882812 674.757812 L 232.753906 674.738281 L 232.625 674.722656 L 232.335938 674.722656 L 232.207031 674.703125 L 228.925781 674.703125 L 228.925781 678.933594 L 232.207031 678.933594 L 232.882812 678.898438 L 233.464844 678.789062 L 233.957031 678.585938 L 234.320312 678.3125 L 234.613281 677.949219 L 234.796875 677.511719 L 234.8125 677.421875 L 234.851562 677.203125 L 234.851562 676.945312 Z M 233.0625 685.003906 L 233.574219 684.988281 L 234.03125 684.878906 L 234.429688 684.695312 L 234.757812 684.457031 L 235.03125 684.148438 L 235.25 683.765625 L 235.304688 683.621094 L 235.34375 683.457031 L 235.398438 683.273438 L 235.414062 683.109375 L 235.433594 682.925781 L 235.453125 682.726562 L 235.414062 682.324219 L 235.34375 681.941406 L 235.214844 681.613281 L 235.03125 681.304688 L 234.796875 681.046875 L 234.523438 680.8125 L 234.320312 680.703125 L 234.101562 680.609375 L 233.867188 680.539062 L 233.609375 680.484375 L 233.335938 680.445312 L 233.0625 680.429688 L 228.925781 680.429688 L 228.925781 685.003906 Z M 233.0625 685.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 219 396 L 219 403 M 215 400 L 222 400 " 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 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 M 219 400 L 219 400 " 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 194 395 L 194 404 M 189 400 L 198 400 M 193 401 L 195 401 M 193 399 L 195 399 M 193 399 L 193 401 M 195 399 L 195 401 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.svg b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.svg
index 3ee0a1d..ed322db 100644
--- a/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.svg
+++ b/cells/sedfxbp/sky130_fd_sc_hd__sedfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 377.5 L 1744.5 377.5 L 1744.5 526.5 L 174.5 526.5 Z M 920.5 526.5 L 1744.5 526.5 L 1744.5 539.5 L 920.5 539.5 Z M 174.5 526.5 L 686.5 526.5 L 686.5 539.5 L 174.5 539.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image530" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image559" 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="#image530"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 208.5 662.5 L 225.5 662.5 L 225.5 679.5 L 208.5 679.5 Z M 208.5 662.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image530"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 754.5 568.5 L 769.5 568.5 L 769.5 611.5 L 754.5 611.5 Z M 797.5 568.5 L 812.5 568.5 L 812.5 611.5 L 797.5 611.5 Z M 833.5 568.5 L 848.5 568.5 L 848.5 611.5 L 833.5 611.5 Z M 1276.5 611.5 L 1291.5 611.5 L 1291.5 647.5 L 1276.5 647.5 Z M 1223.5 611.5 L 1238.5 611.5 L 1238.5 647.5 L 1223.5 647.5 Z M 276.5 605.5 L 291.5 605.5 L 291.5 647.5 L 276.5 647.5 Z M 1324.5 605.5 L 1339.5 605.5 L 1339.5 647.5 L 1324.5 647.5 Z M 1538.5 605.5 L 1553.5 605.5 L 1553.5 647.5 L 1538.5 647.5 Z M 370.5 605.5 L 386.5 605.5 L 386.5 647.5 L 370.5 647.5 Z M 1174.5 605.5 L 1189.5 605.5 L 1189.5 647.5 L 1174.5 647.5 Z M 407.5 605.5 L 422.5 605.5 L 422.5 647.5 L 407.5 647.5 Z M 1019.5 605.5 L 1034.5 605.5 L 1034.5 647.5 L 1019.5 647.5 Z M 546.5 605.5 L 561.5 605.5 L 561.5 647.5 L 546.5 647.5 Z M 502.5 605.5 L 517.5 605.5 L 517.5 647.5 L 502.5 647.5 Z M 597.5 605.5 L 613.5 605.5 L 613.5 647.5 L 597.5 647.5 Z M 640.5 605.5 L 655.5 605.5 L 655.5 647.5 L 640.5 647.5 Z M 233.5 605.5 L 248.5 605.5 L 248.5 647.5 L 233.5 647.5 Z M 1079.5 582.5 L 1094.5 582.5 L 1094.5 647.5 L 1079.5 647.5 Z M 1415.5 581.5 L 1430.5 581.5 L 1430.5 647.5 L 1415.5 647.5 Z M 1629.5 581.5 L 1644.5 581.5 L 1644.5 647.5 L 1629.5 647.5 Z M 1587.5 581.5 L 1602.5 581.5 L 1602.5 647.5 L 1587.5 647.5 Z M 1373.5 581.5 L 1388.5 581.5 L 1388.5 647.5 L 1373.5 647.5 Z M 921.5 611.5 L 936.5 611.5 L 936.5 647.5 L 921.5 647.5 Z M 965.5 611.5 L 981.5 611.5 L 981.5 647.5 L 965.5 647.5 Z M 965.5 611.5 "/>
 </clipPath>
-<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image560" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image531"/>
+  <use xlink:href="#image560"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1312.5 420.5 L 1328.5 420.5 L 1328.5 462.5 L 1312.5 462.5 Z M 1213.5 420.5 L 1228.5 420.5 L 1228.5 462.5 L 1213.5 462.5 Z M 1167.5 420.5 L 1182.5 420.5 L 1182.5 462.5 L 1167.5 462.5 Z M 1005.5 420.5 L 1020.5 420.5 L 1020.5 462.5 L 1005.5 462.5 Z M 1255.5 420.5 L 1270.5 420.5 L 1270.5 462.5 L 1255.5 462.5 Z M 953.5 420.5 L 969.5 420.5 L 969.5 462.5 L 953.5 462.5 Z M 908.5 420.5 L 923.5 420.5 L 923.5 462.5 L 908.5 462.5 Z M 744.5 420.5 L 759.5 420.5 L 759.5 485.5 L 744.5 485.5 Z M 644.5 420.5 L 659.5 420.5 L 659.5 485.5 L 644.5 485.5 Z M 597.5 420.5 L 613.5 420.5 L 613.5 485.5 L 597.5 485.5 Z M 799.5 420.5 L 814.5 420.5 L 814.5 485.5 L 799.5 485.5 Z M 847.5 420.5 L 863.5 420.5 L 863.5 485.5 L 847.5 485.5 Z M 502.5 420.5 L 517.5 420.5 L 517.5 485.5 L 502.5 485.5 Z M 407.5 420.5 L 422.5 420.5 L 422.5 485.5 L 407.5 485.5 Z M 370.5 420.5 L 386.5 420.5 L 386.5 485.5 L 370.5 485.5 Z M 546.5 420.5 L 561.5 420.5 L 561.5 485.5 L 546.5 485.5 Z M 1538.5 420.5 L 1553.5 420.5 L 1553.5 485.5 L 1538.5 485.5 Z M 276.5 423.5 L 291.5 423.5 L 291.5 488.5 L 276.5 488.5 Z M 233.5 423.5 L 248.5 423.5 L 248.5 488.5 L 233.5 488.5 Z M 1072.5 420.5 L 1087.5 420.5 L 1087.5 496.5 L 1072.5 496.5 Z M 1361.5 420.5 L 1376.5 420.5 L 1376.5 521.5 L 1361.5 521.5 Z M 1629.5 420.5 L 1644.5 420.5 L 1644.5 521.5 L 1629.5 521.5 Z M 1404.5 420.5 L 1419.5 420.5 L 1419.5 521.5 L 1404.5 521.5 Z M 1587.5 420.5 L 1602.5 420.5 L 1602.5 521.5 L 1587.5 521.5 Z M 1587.5 420.5 "/>
 </clipPath>
-<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image561" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image561"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 388.5 L 225.5 388.5 L 225.5 405.5 L 208.5 405.5 Z M 1693.5 388.5 L 1710.5 388.5 L 1710.5 405.5 L 1693.5 405.5 Z M 1646.5 388.5 L 1663.5 388.5 L 1663.5 405.5 L 1646.5 405.5 Z M 1600.5 388.5 L 1617.5 388.5 L 1617.5 405.5 L 1600.5 405.5 Z M 1553.5 388.5 L 1571.5 388.5 L 1571.5 405.5 L 1553.5 405.5 Z M 1507.5 388.5 L 1524.5 388.5 L 1524.5 405.5 L 1507.5 405.5 Z M 1461.5 388.5 L 1478.5 388.5 L 1478.5 405.5 L 1461.5 405.5 Z M 1414.5 388.5 L 1431.5 388.5 L 1431.5 405.5 L 1414.5 405.5 Z M 1368.5 388.5 L 1385.5 388.5 L 1385.5 405.5 L 1368.5 405.5 Z M 1321.5 388.5 L 1339.5 388.5 L 1339.5 405.5 L 1321.5 405.5 Z M 1275.5 388.5 L 1292.5 388.5 L 1292.5 405.5 L 1275.5 405.5 Z M 1229.5 388.5 L 1246.5 388.5 L 1246.5 405.5 L 1229.5 405.5 Z M 1182.5 388.5 L 1199.5 388.5 L 1199.5 405.5 L 1182.5 405.5 Z M 1136.5 388.5 L 1153.5 388.5 L 1153.5 405.5 L 1136.5 405.5 Z M 1090.5 388.5 L 1107.5 388.5 L 1107.5 405.5 L 1090.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 997.5 388.5 L 1014.5 388.5 L 1014.5 405.5 L 997.5 405.5 Z M 950.5 388.5 L 968.5 388.5 L 968.5 405.5 L 950.5 405.5 Z M 904.5 388.5 L 921.5 388.5 L 921.5 405.5 L 904.5 405.5 Z M 858.5 388.5 L 875.5 388.5 L 875.5 405.5 L 858.5 405.5 Z M 811.5 388.5 L 828.5 388.5 L 828.5 405.5 L 811.5 405.5 Z M 765.5 388.5 L 782.5 388.5 L 782.5 405.5 L 765.5 405.5 Z M 718.5 388.5 L 736.5 388.5 L 736.5 405.5 L 718.5 405.5 Z M 672.5 388.5 L 689.5 388.5 L 689.5 405.5 L 672.5 405.5 Z M 626.5 388.5 L 643.5 388.5 L 643.5 405.5 L 626.5 405.5 Z M 579.5 388.5 L 596.5 388.5 L 596.5 405.5 L 579.5 405.5 Z M 533.5 388.5 L 550.5 388.5 L 550.5 405.5 L 533.5 405.5 Z M 486.5 388.5 L 504.5 388.5 L 504.5 405.5 L 486.5 405.5 Z M 440.5 388.5 L 457.5 388.5 L 457.5 405.5 L 440.5 405.5 Z M 394.5 388.5 L 411.5 388.5 L 411.5 405.5 L 394.5 405.5 Z M 347.5 388.5 L 364.5 388.5 L 364.5 405.5 L 347.5 405.5 Z M 301.5 388.5 L 318.5 388.5 L 318.5 405.5 L 301.5 405.5 Z M 255.5 388.5 L 272.5 388.5 L 272.5 405.5 L 255.5 405.5 Z M 1469.5 474.5 L 1486.5 474.5 L 1486.5 487.5 L 1469.5 487.5 Z M 951.5 474.5 L 968.5 474.5 L 968.5 487.5 L 951.5 487.5 Z M 951.5 487.5 L 968.5 487.5 L 968.5 491.5 L 951.5 491.5 Z M 1301.5 474.5 L 1318.5 474.5 L 1318.5 491.5 L 1301.5 491.5 Z M 1212.5 474.5 L 1229.5 474.5 L 1229.5 491.5 L 1212.5 491.5 Z M 258.5 474.5 L 275.5 474.5 L 275.5 491.5 L 258.5 491.5 Z M 1469.5 487.5 L 1486.5 487.5 L 1486.5 491.5 L 1469.5 491.5 Z M 1254.5 508.5 L 1272.5 508.5 L 1272.5 525.5 L 1254.5 525.5 Z M 910.5 508.5 L 927.5 508.5 L 927.5 525.5 L 910.5 525.5 Z M 296.5 508.5 L 313.5 508.5 L 313.5 525.5 L 296.5 525.5 Z M 577.5 576.5 L 594.5 576.5 L 594.5 594.5 L 577.5 594.5 Z M 1516.5 576.5 L 1533.5 576.5 L 1533.5 594.5 L 1516.5 594.5 Z M 616.5 611.5 L 633.5 611.5 L 633.5 617.5 L 616.5 617.5 Z M 659.5 611.5 L 676.5 611.5 L 676.5 617.5 L 659.5 617.5 Z M 659.5 617.5 L 676.5 617.5 L 676.5 628.5 L 659.5 628.5 Z M 852.5 611.5 L 869.5 611.5 L 869.5 628.5 L 852.5 628.5 Z M 330.5 611.5 L 347.5 611.5 L 347.5 628.5 L 330.5 628.5 Z M 616.5 617.5 L 633.5 617.5 L 633.5 628.5 L 616.5 628.5 Z M 208.5 662.5 L 225.5 662.5 L 225.5 679.5 L 208.5 679.5 Z M 1693.5 662.5 L 1710.5 662.5 L 1710.5 679.5 L 1693.5 679.5 Z M 1646.5 662.5 L 1663.5 662.5 L 1663.5 679.5 L 1646.5 679.5 Z M 1600.5 662.5 L 1617.5 662.5 L 1617.5 679.5 L 1600.5 679.5 Z M 1553.5 662.5 L 1571.5 662.5 L 1571.5 679.5 L 1553.5 679.5 Z M 1507.5 662.5 L 1524.5 662.5 L 1524.5 679.5 L 1507.5 679.5 Z M 1461.5 662.5 L 1478.5 662.5 L 1478.5 679.5 L 1461.5 679.5 Z M 1414.5 662.5 L 1431.5 662.5 L 1431.5 679.5 L 1414.5 679.5 Z M 1368.5 662.5 L 1385.5 662.5 L 1385.5 679.5 L 1368.5 679.5 Z M 1321.5 662.5 L 1339.5 662.5 L 1339.5 679.5 L 1321.5 679.5 Z M 1275.5 662.5 L 1292.5 662.5 L 1292.5 679.5 L 1275.5 679.5 Z M 1229.5 662.5 L 1246.5 662.5 L 1246.5 679.5 L 1229.5 679.5 Z M 1182.5 662.5 L 1199.5 662.5 L 1199.5 679.5 L 1182.5 679.5 Z M 1136.5 662.5 L 1153.5 662.5 L 1153.5 679.5 L 1136.5 679.5 Z M 1090.5 662.5 L 1107.5 662.5 L 1107.5 679.5 L 1090.5 679.5 Z M 1043.5 662.5 L 1060.5 662.5 L 1060.5 679.5 L 1043.5 679.5 Z M 997.5 662.5 L 1014.5 662.5 L 1014.5 679.5 L 997.5 679.5 Z M 950.5 662.5 L 968.5 662.5 L 968.5 679.5 L 950.5 679.5 Z M 904.5 662.5 L 921.5 662.5 L 921.5 679.5 L 904.5 679.5 Z M 858.5 662.5 L 875.5 662.5 L 875.5 679.5 L 858.5 679.5 Z M 811.5 662.5 L 828.5 662.5 L 828.5 679.5 L 811.5 679.5 Z M 765.5 662.5 L 782.5 662.5 L 782.5 679.5 L 765.5 679.5 Z M 718.5 662.5 L 736.5 662.5 L 736.5 679.5 L 718.5 679.5 Z M 672.5 662.5 L 689.5 662.5 L 689.5 679.5 L 672.5 679.5 Z M 626.5 662.5 L 643.5 662.5 L 643.5 679.5 L 626.5 679.5 Z M 579.5 662.5 L 596.5 662.5 L 596.5 679.5 L 579.5 679.5 Z M 533.5 662.5 L 550.5 662.5 L 550.5 679.5 L 533.5 679.5 Z M 486.5 662.5 L 504.5 662.5 L 504.5 679.5 L 486.5 679.5 Z M 440.5 662.5 L 457.5 662.5 L 457.5 679.5 L 440.5 679.5 Z M 394.5 662.5 L 411.5 662.5 L 411.5 679.5 L 394.5 679.5 Z M 347.5 662.5 L 364.5 662.5 L 364.5 679.5 L 347.5 679.5 Z M 301.5 662.5 L 318.5 662.5 L 318.5 679.5 L 301.5 679.5 Z M 255.5 662.5 L 272.5 662.5 L 272.5 679.5 L 255.5 679.5 Z M 255.5 662.5 "/>
 </clipPath>
-<image id="image533" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image562" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image533"/>
+  <use xlink:href="#image562"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface527">
+<g id="surface556">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -242,6 +242,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 233.328125 674 L 233.296875 674.539062 L 233.210938 675.027344 L 233.058594 675.480469 L 232.859375 675.882812 L 232.589844 676.269531 L 232.269531 676.609375 L 231.914062 676.894531 L 231.542969 677.113281 L 231.125 677.28125 L 230.6875 677.414062 L 230.214844 677.484375 L 229.710938 677.5 L 224.171875 677.5 L 224.171875 665.230469 L 229.15625 665.230469 L 229.878906 665.28125 L 230.519531 665.398438 L 231.089844 665.601562 L 231.578125 665.886719 L 232 666.257812 L 232.335938 666.710938 L 232.46875 666.964844 L 232.589844 667.234375 L 232.671875 667.484375 L 232.738281 667.773438 L 232.773438 668.058594 L 232.789062 668.34375 L 232.738281 668.949219 L 232.589844 669.472656 L 232.351562 669.960938 L 232.015625 670.363281 L 231.59375 670.734375 L 231.089844 671.019531 L 231.578125 671.238281 L 232 671.476562 L 232.371094 671.742188 L 232.671875 672.046875 L 232.90625 672.367188 L 233.09375 672.703125 L 233.160156 672.90625 L 233.210938 673.105469 L 233.261719 673.308594 L 233.296875 673.542969 L 233.3125 673.765625 Z M 231.226562 668.5625 L 231.175781 668.058594 L 231.023438 667.636719 L 230.789062 667.265625 L 230.449219 666.996094 L 230.03125 666.796875 L 229.507812 666.660156 L 229.390625 666.660156 L 229.15625 666.628906 L 228.886719 666.628906 L 228.769531 666.609375 L 225.738281 666.609375 L 225.738281 670.515625 L 228.769531 670.515625 L 229.390625 670.480469 L 229.929688 670.378906 L 230.382812 670.195312 L 230.71875 669.941406 L 230.988281 669.605469 L 231.15625 669.203125 L 231.175781 669.117188 L 231.191406 669.015625 L 231.207031 668.917969 L 231.207031 668.679688 Z M 229.558594 676.121094 L 230.03125 676.101562 L 230.449219 676.003906 L 230.820312 675.832031 L 231.125 675.613281 L 231.375 675.328125 L 231.578125 674.976562 L 231.628906 674.839844 L 231.664062 674.6875 L 231.714844 674.519531 L 231.730469 674.371094 L 231.746094 674.203125 L 231.765625 674.015625 L 231.730469 673.644531 L 231.664062 673.292969 L 231.542969 672.988281 L 231.375 672.703125 L 231.15625 672.46875 L 230.90625 672.25 L 230.71875 672.148438 L 230.519531 672.0625 L 230.300781 671.996094 L 230.0625 671.945312 L 229.8125 671.914062 L 229.558594 671.894531 L 225.738281 671.894531 L 225.738281 676.121094 Z M 229.558594 676.121094 "/>
 <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 217 404 L 217 411 M 213 408 L 220 408 " 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 217 408 L 217 408 M 217 408 L 217 408 M 217 408 L 217 408 M 217 408 L 217 408 " 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 193 403 L 193 412 M 188 408 L 197 408 M 192 409 L 194 409 M 192 407 L 194 407 M 192 407 L 192 409 M 194 407 L 194 409 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.svg b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.svg
index 5ca5aee..54a397f 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 356.5 L 1744.5 356.5 L 1744.5 525.5 L 174.5 525.5 Z M 1020.5 525.5 L 1744.5 525.5 L 1744.5 540.5 L 1020.5 540.5 Z M 174.5 525.5 L 755.5 525.5 L 755.5 540.5 L 174.5 540.5 Z M 174.5 525.5 "/>
 </clipPath>
-<image id="image514" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image541" 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="#image514"/>
+  <use xlink:href="#image541"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 213.5 680.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image514"/>
+  <use xlink:href="#image541"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 832.5 573.5 L 849.5 573.5 L 849.5 621.5 L 832.5 621.5 Z M 880.5 573.5 L 897.5 573.5 L 897.5 621.5 L 880.5 621.5 Z M 921.5 573.5 L 938.5 573.5 L 938.5 621.5 L 921.5 621.5 Z M 1363.5 621.5 L 1381.5 621.5 L 1381.5 662.5 L 1363.5 662.5 Z M 1424.5 621.5 L 1441.5 621.5 L 1441.5 662.5 L 1424.5 662.5 Z M 1478.5 614.5 L 1496.5 614.5 L 1496.5 662.5 L 1478.5 662.5 Z M 1308.5 614.5 L 1325.5 614.5 L 1325.5 662.5 L 1308.5 662.5 Z M 397.5 614.5 L 414.5 614.5 L 414.5 662.5 L 397.5 662.5 Z M 1132.5 614.5 L 1150.5 614.5 L 1150.5 662.5 L 1132.5 662.5 Z M 546.5 614.5 L 563.5 614.5 L 563.5 662.5 L 546.5 662.5 Z M 1586.5 614.5 L 1603.5 614.5 L 1603.5 662.5 L 1586.5 662.5 Z M 654.5 614.5 L 671.5 614.5 L 671.5 662.5 L 654.5 662.5 Z M 289.5 614.5 L 306.5 614.5 L 306.5 662.5 L 289.5 662.5 Z M 241.5 614.5 L 258.5 614.5 L 258.5 662.5 L 241.5 662.5 Z M 702.5 614.5 L 719.5 614.5 L 719.5 662.5 L 702.5 662.5 Z M 438.5 614.5 L 455.5 614.5 L 455.5 662.5 L 438.5 662.5 Z M 596.5 614.5 L 613.5 614.5 L 613.5 662.5 L 596.5 662.5 Z M 1200.5 589.5 L 1218.5 589.5 L 1218.5 662.5 L 1200.5 662.5 Z M 1641.5 588.5 L 1659.5 588.5 L 1659.5 662.5 L 1641.5 662.5 Z M 1021.5 621.5 L 1039.5 621.5 L 1039.5 662.5 L 1021.5 662.5 Z M 1072.5 621.5 L 1089.5 621.5 L 1089.5 662.5 L 1072.5 662.5 Z M 1072.5 621.5 "/>
 </clipPath>
-<image id="image515" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image542" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image515"/>
+  <use xlink:href="#image542"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1465.5 405.5 L 1482.5 405.5 L 1482.5 453.5 L 1465.5 453.5 Z M 1400.5 405.5 L 1417.5 405.5 L 1417.5 453.5 L 1400.5 453.5 Z M 1117.5 405.5 L 1134.5 405.5 L 1134.5 453.5 L 1117.5 453.5 Z M 1058.5 405.5 L 1075.5 405.5 L 1075.5 453.5 L 1058.5 453.5 Z M 1352.5 405.5 L 1369.5 405.5 L 1369.5 453.5 L 1352.5 453.5 Z M 1006.5 405.5 L 1023.5 405.5 L 1023.5 453.5 L 1006.5 453.5 Z M 1300.5 405.5 L 1317.5 405.5 L 1317.5 453.5 L 1300.5 453.5 Z M 654.5 405.5 L 671.5 405.5 L 671.5 478.5 L 654.5 478.5 Z M 596.5 405.5 L 613.5 405.5 L 613.5 478.5 L 596.5 478.5 Z M 821.5 405.5 L 838.5 405.5 L 838.5 478.5 L 821.5 478.5 Z M 546.5 405.5 L 563.5 405.5 L 563.5 478.5 L 546.5 478.5 Z M 938.5 405.5 L 955.5 405.5 L 955.5 478.5 L 938.5 478.5 Z M 438.5 405.5 L 455.5 405.5 L 455.5 478.5 L 438.5 478.5 Z M 397.5 405.5 L 414.5 405.5 L 414.5 478.5 L 397.5 478.5 Z M 1586.5 405.5 L 1603.5 405.5 L 1603.5 478.5 L 1586.5 478.5 Z M 707.5 405.5 L 724.5 405.5 L 724.5 478.5 L 707.5 478.5 Z M 883.5 405.5 L 900.5 405.5 L 900.5 478.5 L 883.5 478.5 Z M 241.5 408.5 L 258.5 408.5 L 258.5 482.5 L 241.5 482.5 Z M 289.5 408.5 L 306.5 408.5 L 306.5 482.5 L 289.5 482.5 Z M 1192.5 405.5 L 1210.5 405.5 L 1210.5 491.5 L 1192.5 491.5 Z M 1641.5 405.5 L 1659.5 405.5 L 1659.5 519.5 L 1641.5 519.5 Z M 1641.5 405.5 "/>
 </clipPath>
-<image id="image516" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image543" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image516"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 213.5 368.5 L 232.5 368.5 L 232.5 388.5 L 213.5 388.5 Z M 1686.5 368.5 L 1705.5 368.5 L 1705.5 388.5 L 1686.5 388.5 Z M 1633.5 368.5 L 1653.5 368.5 L 1653.5 388.5 L 1633.5 388.5 Z M 1581.5 368.5 L 1600.5 368.5 L 1600.5 388.5 L 1581.5 388.5 Z M 1528.5 368.5 L 1548.5 368.5 L 1548.5 388.5 L 1528.5 388.5 Z M 1476.5 368.5 L 1495.5 368.5 L 1495.5 388.5 L 1476.5 388.5 Z M 1423.5 368.5 L 1442.5 368.5 L 1442.5 388.5 L 1423.5 388.5 Z M 1370.5 368.5 L 1390.5 368.5 L 1390.5 388.5 L 1370.5 388.5 Z M 1318.5 368.5 L 1337.5 368.5 L 1337.5 388.5 L 1318.5 388.5 Z M 1265.5 368.5 L 1285.5 368.5 L 1285.5 388.5 L 1265.5 388.5 Z M 1212.5 368.5 L 1232.5 368.5 L 1232.5 388.5 L 1212.5 388.5 Z M 1160.5 368.5 L 1179.5 368.5 L 1179.5 388.5 L 1160.5 388.5 Z M 1107.5 368.5 L 1127.5 368.5 L 1127.5 388.5 L 1107.5 388.5 Z M 1055.5 368.5 L 1074.5 368.5 L 1074.5 388.5 L 1055.5 388.5 Z M 1002.5 368.5 L 1021.5 368.5 L 1021.5 388.5 L 1002.5 388.5 Z M 949.5 368.5 L 969.5 368.5 L 969.5 388.5 L 949.5 388.5 Z M 897.5 368.5 L 916.5 368.5 L 916.5 388.5 L 897.5 388.5 Z M 844.5 368.5 L 864.5 368.5 L 864.5 388.5 L 844.5 388.5 Z M 791.5 368.5 L 811.5 368.5 L 811.5 388.5 L 791.5 388.5 Z M 739.5 368.5 L 758.5 368.5 L 758.5 388.5 L 739.5 388.5 Z M 686.5 368.5 L 706.5 368.5 L 706.5 388.5 L 686.5 388.5 Z M 634.5 368.5 L 653.5 368.5 L 653.5 388.5 L 634.5 388.5 Z M 581.5 368.5 L 600.5 368.5 L 600.5 388.5 L 581.5 388.5 Z M 528.5 368.5 L 548.5 368.5 L 548.5 388.5 L 528.5 388.5 Z M 476.5 368.5 L 495.5 368.5 L 495.5 388.5 L 476.5 388.5 Z M 423.5 368.5 L 443.5 368.5 L 443.5 388.5 L 423.5 388.5 Z M 371.5 368.5 L 390.5 368.5 L 390.5 388.5 L 371.5 388.5 Z M 318.5 368.5 L 337.5 368.5 L 337.5 388.5 L 318.5 388.5 Z M 265.5 368.5 L 285.5 368.5 L 285.5 388.5 L 265.5 388.5 Z M 1055.5 466.5 L 1075.5 466.5 L 1075.5 481.5 L 1055.5 481.5 Z M 1055.5 481.5 L 1075.5 481.5 L 1075.5 485.5 L 1055.5 485.5 Z M 269.5 466.5 L 288.5 466.5 L 288.5 485.5 L 269.5 485.5 Z M 1351.5 466.5 L 1371.5 466.5 L 1371.5 485.5 L 1351.5 485.5 Z M 312.5 505.5 L 332.5 505.5 L 332.5 524.5 L 312.5 524.5 Z M 1008.5 505.5 L 1028.5 505.5 L 1028.5 524.5 L 1008.5 524.5 Z M 1399.5 505.5 L 1419.5 505.5 L 1419.5 524.5 L 1399.5 524.5 Z M 1569.5 582.5 L 1588.5 582.5 L 1588.5 602.5 L 1569.5 602.5 Z M 631.5 582.5 L 651.5 582.5 L 651.5 602.5 L 631.5 602.5 Z M 675.5 621.5 L 694.5 621.5 L 694.5 629.5 L 675.5 629.5 Z M 724.5 621.5 L 743.5 621.5 L 743.5 629.5 L 724.5 629.5 Z M 675.5 629.5 L 694.5 629.5 L 694.5 641.5 L 675.5 641.5 Z M 724.5 629.5 L 743.5 629.5 L 743.5 641.5 L 724.5 641.5 Z M 351.5 621.5 L 371.5 621.5 L 371.5 641.5 L 351.5 641.5 Z M 943.5 621.5 L 962.5 621.5 L 962.5 641.5 L 943.5 641.5 Z M 213.5 680.5 L 232.5 680.5 L 232.5 699.5 L 213.5 699.5 Z M 1686.5 680.5 L 1705.5 680.5 L 1705.5 699.5 L 1686.5 699.5 Z M 1633.5 680.5 L 1653.5 680.5 L 1653.5 699.5 L 1633.5 699.5 Z M 1581.5 680.5 L 1600.5 680.5 L 1600.5 699.5 L 1581.5 699.5 Z M 1528.5 680.5 L 1548.5 680.5 L 1548.5 699.5 L 1528.5 699.5 Z M 1476.5 680.5 L 1495.5 680.5 L 1495.5 699.5 L 1476.5 699.5 Z M 1423.5 680.5 L 1442.5 680.5 L 1442.5 699.5 L 1423.5 699.5 Z M 1370.5 680.5 L 1390.5 680.5 L 1390.5 699.5 L 1370.5 699.5 Z M 1318.5 680.5 L 1337.5 680.5 L 1337.5 699.5 L 1318.5 699.5 Z M 1265.5 680.5 L 1285.5 680.5 L 1285.5 699.5 L 1265.5 699.5 Z M 1212.5 680.5 L 1232.5 680.5 L 1232.5 699.5 L 1212.5 699.5 Z M 1160.5 680.5 L 1179.5 680.5 L 1179.5 699.5 L 1160.5 699.5 Z M 1107.5 680.5 L 1127.5 680.5 L 1127.5 699.5 L 1107.5 699.5 Z M 1055.5 680.5 L 1074.5 680.5 L 1074.5 699.5 L 1055.5 699.5 Z M 1002.5 680.5 L 1021.5 680.5 L 1021.5 699.5 L 1002.5 699.5 Z M 949.5 680.5 L 969.5 680.5 L 969.5 699.5 L 949.5 699.5 Z M 897.5 680.5 L 916.5 680.5 L 916.5 699.5 L 897.5 699.5 Z M 844.5 680.5 L 864.5 680.5 L 864.5 699.5 L 844.5 699.5 Z M 791.5 680.5 L 811.5 680.5 L 811.5 699.5 L 791.5 699.5 Z M 739.5 680.5 L 758.5 680.5 L 758.5 699.5 L 739.5 699.5 Z M 686.5 680.5 L 706.5 680.5 L 706.5 699.5 L 686.5 699.5 Z M 634.5 680.5 L 653.5 680.5 L 653.5 699.5 L 634.5 699.5 Z M 581.5 680.5 L 600.5 680.5 L 600.5 699.5 L 581.5 699.5 Z M 528.5 680.5 L 548.5 680.5 L 548.5 699.5 L 528.5 699.5 Z M 476.5 680.5 L 495.5 680.5 L 495.5 699.5 L 476.5 699.5 Z M 423.5 680.5 L 443.5 680.5 L 443.5 699.5 L 423.5 699.5 Z M 371.5 680.5 L 390.5 680.5 L 390.5 699.5 L 371.5 699.5 Z M 318.5 680.5 L 337.5 680.5 L 337.5 699.5 L 318.5 699.5 Z M 265.5 680.5 L 285.5 680.5 L 285.5 699.5 L 265.5 699.5 Z M 265.5 680.5 "/>
 </clipPath>
-<image id="image517" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image544" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image517"/>
+  <use xlink:href="#image544"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface511">
+<g id="surface538">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -235,6 +235,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 242.96875 692.414062 L 242.929688 693.042969 L 242.828125 693.613281 L 242.652344 694.144531 L 242.417969 694.613281 L 242.101562 695.066406 L 241.730469 695.460938 L 241.316406 695.792969 L 240.886719 696.046875 L 240.394531 696.246094 L 239.882812 696.402344 L 239.335938 696.480469 L 238.746094 696.5 L 232.285156 696.5 L 232.285156 682.1875 L 238.097656 682.1875 L 238.941406 682.246094 L 239.6875 682.382812 L 240.355469 682.617188 L 240.925781 682.953125 L 241.414062 683.382812 L 241.808594 683.914062 L 241.964844 684.207031 L 242.101562 684.523438 L 242.203125 684.816406 L 242.28125 685.152344 L 242.320312 685.484375 L 242.339844 685.820312 L 242.28125 686.523438 L 242.101562 687.132812 L 241.828125 687.703125 L 241.433594 688.175781 L 240.945312 688.605469 L 240.355469 688.941406 L 240.925781 689.195312 L 241.414062 689.46875 L 241.847656 689.785156 L 242.203125 690.136719 L 242.476562 690.511719 L 242.691406 690.902344 L 242.769531 691.140625 L 242.886719 691.609375 L 242.929688 691.886719 L 242.949219 692.140625 Z M 240.511719 686.074219 L 240.453125 685.484375 L 240.277344 684.992188 L 240.003906 684.5625 L 239.609375 684.246094 L 239.117188 684.011719 L 238.511719 683.855469 L 238.371094 683.855469 L 238.097656 683.816406 L 237.785156 683.816406 L 237.644531 683.796875 L 234.113281 683.796875 L 234.113281 688.351562 L 237.644531 688.351562 L 238.371094 688.3125 L 239 688.195312 L 239.53125 687.976562 L 239.921875 687.683594 L 240.238281 687.292969 L 240.433594 686.820312 L 240.453125 686.722656 L 240.472656 686.605469 L 240.492188 686.484375 L 240.492188 686.210938 Z M 238.570312 694.890625 L 239.117188 694.871094 L 239.609375 694.753906 L 240.042969 694.554688 L 240.394531 694.300781 L 240.6875 693.96875 L 240.925781 693.554688 L 240.984375 693.398438 L 241.023438 693.222656 L 241.082031 693.023438 L 241.101562 692.847656 L 241.121094 692.652344 L 241.140625 692.433594 L 241.101562 692.003906 L 241.023438 691.589844 L 240.886719 691.238281 L 240.6875 690.902344 L 240.433594 690.628906 L 240.140625 690.375 L 239.921875 690.257812 L 239.6875 690.15625 L 239.433594 690.078125 L 239.15625 690.019531 L 238.863281 689.980469 L 238.570312 689.960938 L 234.113281 689.960938 L 234.113281 694.890625 Z M 238.570312 694.890625 "/>
 <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 222 386 L 222 393 M 218 390 L 225 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 222 390 L 222 390 M 222 390 L 222 390 M 222 390 L 222 390 M 222 390 L 222 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(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 385 L 196 394 M 191 390 L 200 390 M 195 391 L 197 391 M 195 389 L 197 389 M 195 389 L 195 391 M 197 389 L 197 391 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.svg b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.svg
index c81a90a..6431599 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 362.5 L 1743.5 362.5 L 1743.5 525.5 L 174.5 525.5 Z M 992.5 525.5 L 1743.5 525.5 L 1743.5 540.5 L 992.5 540.5 Z M 174.5 525.5 L 736.5 525.5 L 736.5 540.5 L 174.5 540.5 Z M 174.5 525.5 "/>
 </clipPath>
-<image id="image515" 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="#image515"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 675.5 L 230.5 675.5 L 230.5 694.5 L 211.5 694.5 Z M 211.5 675.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image515"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 810.5 572.5 L 827.5 572.5 L 827.5 618.5 L 810.5 618.5 Z M 857.5 572.5 L 874.5 572.5 L 874.5 618.5 L 857.5 618.5 Z M 897.5 572.5 L 913.5 572.5 L 913.5 618.5 L 897.5 618.5 Z M 994.5 618.5 L 1010.5 618.5 L 1010.5 658.5 L 994.5 658.5 Z M 1324.5 618.5 L 1341.5 618.5 L 1341.5 658.5 L 1324.5 658.5 Z M 582.5 612.5 L 599.5 612.5 L 599.5 658.5 L 582.5 658.5 Z M 1436.5 612.5 L 1452.5 612.5 L 1452.5 658.5 L 1436.5 658.5 Z M 1271.5 612.5 L 1287.5 612.5 L 1287.5 658.5 L 1271.5 658.5 Z M 389.5 612.5 L 406.5 612.5 L 406.5 658.5 L 389.5 658.5 Z M 1101.5 612.5 L 1118.5 612.5 L 1118.5 658.5 L 1101.5 658.5 Z M 533.5 612.5 L 550.5 612.5 L 550.5 658.5 L 533.5 658.5 Z M 1540.5 612.5 L 1556.5 612.5 L 1556.5 658.5 L 1540.5 658.5 Z M 638.5 612.5 L 655.5 612.5 L 655.5 658.5 L 638.5 658.5 Z M 285.5 612.5 L 302.5 612.5 L 302.5 658.5 L 285.5 658.5 Z M 239.5 612.5 L 255.5 612.5 L 255.5 658.5 L 239.5 658.5 Z M 685.5 612.5 L 701.5 612.5 L 701.5 658.5 L 685.5 658.5 Z M 429.5 612.5 L 446.5 612.5 L 446.5 658.5 L 429.5 658.5 Z M 1167.5 587.5 L 1183.5 587.5 L 1183.5 658.5 L 1167.5 658.5 Z M 1593.5 586.5 L 1610.5 586.5 L 1610.5 658.5 L 1593.5 658.5 Z M 1640.5 586.5 L 1656.5 586.5 L 1656.5 658.5 L 1640.5 658.5 Z M 1042.5 618.5 L 1059.5 618.5 L 1059.5 658.5 L 1042.5 658.5 Z M 1383.5 618.5 L 1400.5 618.5 L 1400.5 658.5 L 1383.5 658.5 Z M 1383.5 618.5 "/>
 </clipPath>
-<image id="image516" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image544" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image516"/>
+  <use xlink:href="#image544"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1423.5 409.5 L 1440.5 409.5 L 1440.5 456.5 L 1423.5 456.5 Z M 1360.5 409.5 L 1377.5 409.5 L 1377.5 456.5 L 1360.5 456.5 Z M 1086.5 409.5 L 1103.5 409.5 L 1103.5 456.5 L 1086.5 456.5 Z M 1029.5 409.5 L 1046.5 409.5 L 1046.5 456.5 L 1029.5 456.5 Z M 979.5 409.5 L 995.5 409.5 L 995.5 456.5 L 979.5 456.5 Z M 1313.5 409.5 L 1330.5 409.5 L 1330.5 456.5 L 1313.5 456.5 Z M 1263.5 409.5 L 1280.5 409.5 L 1280.5 456.5 L 1263.5 456.5 Z M 429.5 409.5 L 446.5 409.5 L 446.5 480.5 L 429.5 480.5 Z M 689.5 409.5 L 706.5 409.5 L 706.5 480.5 L 689.5 480.5 Z M 638.5 409.5 L 655.5 409.5 L 655.5 480.5 L 638.5 480.5 Z M 582.5 409.5 L 599.5 409.5 L 599.5 480.5 L 582.5 480.5 Z M 533.5 409.5 L 550.5 409.5 L 550.5 480.5 L 533.5 480.5 Z M 389.5 409.5 L 406.5 409.5 L 406.5 480.5 L 389.5 480.5 Z M 1540.5 409.5 L 1556.5 409.5 L 1556.5 480.5 L 1540.5 480.5 Z M 913.5 409.5 L 929.5 409.5 L 929.5 480.5 L 913.5 480.5 Z M 860.5 409.5 L 876.5 409.5 L 876.5 480.5 L 860.5 480.5 Z M 799.5 409.5 L 816.5 409.5 L 816.5 480.5 L 799.5 480.5 Z M 239.5 412.5 L 255.5 412.5 L 255.5 483.5 L 239.5 483.5 Z M 285.5 412.5 L 302.5 412.5 L 302.5 483.5 L 285.5 483.5 Z M 1159.5 409.5 L 1176.5 409.5 L 1176.5 492.5 L 1159.5 492.5 Z M 1593.5 409.5 L 1610.5 409.5 L 1610.5 520.5 L 1593.5 520.5 Z M 1640.5 409.5 L 1656.5 409.5 L 1656.5 520.5 L 1640.5 520.5 Z M 1640.5 409.5 "/>
 </clipPath>
-<image id="image517" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image545" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image517"/>
+  <use xlink:href="#image545"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 374.5 L 230.5 374.5 L 230.5 393.5 L 211.5 393.5 Z M 1687.5 374.5 L 1706.5 374.5 L 1706.5 393.5 L 1687.5 393.5 Z M 1637.5 374.5 L 1655.5 374.5 L 1655.5 393.5 L 1637.5 393.5 Z M 1586.5 374.5 L 1604.5 374.5 L 1604.5 393.5 L 1586.5 393.5 Z M 1535.5 374.5 L 1554.5 374.5 L 1554.5 393.5 L 1535.5 393.5 Z M 1484.5 374.5 L 1503.5 374.5 L 1503.5 393.5 L 1484.5 393.5 Z M 1433.5 374.5 L 1452.5 374.5 L 1452.5 393.5 L 1433.5 393.5 Z M 1382.5 374.5 L 1401.5 374.5 L 1401.5 393.5 L 1382.5 393.5 Z M 1331.5 374.5 L 1350.5 374.5 L 1350.5 393.5 L 1331.5 393.5 Z M 1280.5 374.5 L 1299.5 374.5 L 1299.5 393.5 L 1280.5 393.5 Z M 1229.5 374.5 L 1248.5 374.5 L 1248.5 393.5 L 1229.5 393.5 Z M 1178.5 374.5 L 1197.5 374.5 L 1197.5 393.5 L 1178.5 393.5 Z M 1128.5 374.5 L 1146.5 374.5 L 1146.5 393.5 L 1128.5 393.5 Z M 1077.5 374.5 L 1095.5 374.5 L 1095.5 393.5 L 1077.5 393.5 Z M 1026.5 374.5 L 1045.5 374.5 L 1045.5 393.5 L 1026.5 393.5 Z M 975.5 374.5 L 994.5 374.5 L 994.5 393.5 L 975.5 393.5 Z M 924.5 374.5 L 943.5 374.5 L 943.5 393.5 L 924.5 393.5 Z M 873.5 374.5 L 892.5 374.5 L 892.5 393.5 L 873.5 393.5 Z M 822.5 374.5 L 841.5 374.5 L 841.5 393.5 L 822.5 393.5 Z M 771.5 374.5 L 790.5 374.5 L 790.5 393.5 L 771.5 393.5 Z M 720.5 374.5 L 739.5 374.5 L 739.5 393.5 L 720.5 393.5 Z M 669.5 374.5 L 688.5 374.5 L 688.5 393.5 L 669.5 393.5 Z M 618.5 374.5 L 637.5 374.5 L 637.5 393.5 L 618.5 393.5 Z M 568.5 374.5 L 586.5 374.5 L 586.5 393.5 L 568.5 393.5 Z M 517.5 374.5 L 535.5 374.5 L 535.5 393.5 L 517.5 393.5 Z M 466.5 374.5 L 485.5 374.5 L 485.5 393.5 L 466.5 393.5 Z M 415.5 374.5 L 434.5 374.5 L 434.5 393.5 L 415.5 393.5 Z M 364.5 374.5 L 383.5 374.5 L 383.5 393.5 L 364.5 393.5 Z M 313.5 374.5 L 332.5 374.5 L 332.5 393.5 L 313.5 393.5 Z M 262.5 374.5 L 281.5 374.5 L 281.5 393.5 L 262.5 393.5 Z M 1026.5 468.5 L 1045.5 468.5 L 1045.5 482.5 L 1026.5 482.5 Z M 1026.5 482.5 L 1045.5 482.5 L 1045.5 487.5 L 1026.5 487.5 Z M 265.5 468.5 L 284.5 468.5 L 284.5 487.5 L 265.5 487.5 Z M 1313.5 468.5 L 1332.5 468.5 L 1332.5 487.5 L 1313.5 487.5 Z M 308.5 505.5 L 326.5 505.5 L 326.5 524.5 L 308.5 524.5 Z M 1359.5 505.5 L 1378.5 505.5 L 1378.5 524.5 L 1359.5 524.5 Z M 981.5 505.5 L 1000.5 505.5 L 1000.5 524.5 L 981.5 524.5 Z M 616.5 581.5 L 635.5 581.5 L 635.5 600.5 L 616.5 600.5 Z M 1523.5 581.5 L 1542.5 581.5 L 1542.5 600.5 L 1523.5 600.5 Z M 706.5 618.5 L 725.5 618.5 L 725.5 626.5 L 706.5 626.5 Z M 658.5 618.5 L 677.5 618.5 L 677.5 626.5 L 658.5 626.5 Z M 658.5 626.5 L 677.5 626.5 L 677.5 637.5 L 658.5 637.5 Z M 706.5 626.5 L 725.5 626.5 L 725.5 637.5 L 706.5 637.5 Z M 345.5 618.5 L 364.5 618.5 L 364.5 637.5 L 345.5 637.5 Z M 918.5 618.5 L 937.5 618.5 L 937.5 637.5 L 918.5 637.5 Z M 211.5 675.5 L 230.5 675.5 L 230.5 694.5 L 211.5 694.5 Z M 1687.5 675.5 L 1706.5 675.5 L 1706.5 694.5 L 1687.5 694.5 Z M 1637.5 675.5 L 1655.5 675.5 L 1655.5 694.5 L 1637.5 694.5 Z M 1586.5 675.5 L 1604.5 675.5 L 1604.5 694.5 L 1586.5 694.5 Z M 1535.5 675.5 L 1554.5 675.5 L 1554.5 694.5 L 1535.5 694.5 Z M 1484.5 675.5 L 1503.5 675.5 L 1503.5 694.5 L 1484.5 694.5 Z M 1433.5 675.5 L 1452.5 675.5 L 1452.5 694.5 L 1433.5 694.5 Z M 1382.5 675.5 L 1401.5 675.5 L 1401.5 694.5 L 1382.5 694.5 Z M 1331.5 675.5 L 1350.5 675.5 L 1350.5 694.5 L 1331.5 694.5 Z M 1280.5 675.5 L 1299.5 675.5 L 1299.5 694.5 L 1280.5 694.5 Z M 1229.5 675.5 L 1248.5 675.5 L 1248.5 694.5 L 1229.5 694.5 Z M 1178.5 675.5 L 1197.5 675.5 L 1197.5 694.5 L 1178.5 694.5 Z M 1128.5 675.5 L 1146.5 675.5 L 1146.5 694.5 L 1128.5 694.5 Z M 1077.5 675.5 L 1095.5 675.5 L 1095.5 694.5 L 1077.5 694.5 Z M 1026.5 675.5 L 1045.5 675.5 L 1045.5 694.5 L 1026.5 694.5 Z M 975.5 675.5 L 994.5 675.5 L 994.5 694.5 L 975.5 694.5 Z M 924.5 675.5 L 943.5 675.5 L 943.5 694.5 L 924.5 694.5 Z M 873.5 675.5 L 892.5 675.5 L 892.5 694.5 L 873.5 694.5 Z M 822.5 675.5 L 841.5 675.5 L 841.5 694.5 L 822.5 694.5 Z M 771.5 675.5 L 790.5 675.5 L 790.5 694.5 L 771.5 694.5 Z M 720.5 675.5 L 739.5 675.5 L 739.5 694.5 L 720.5 694.5 Z M 669.5 675.5 L 688.5 675.5 L 688.5 694.5 L 669.5 694.5 Z M 618.5 675.5 L 637.5 675.5 L 637.5 694.5 L 618.5 694.5 Z M 568.5 675.5 L 586.5 675.5 L 586.5 694.5 L 568.5 694.5 Z M 517.5 675.5 L 535.5 675.5 L 535.5 694.5 L 517.5 694.5 Z M 466.5 675.5 L 485.5 675.5 L 485.5 694.5 L 466.5 694.5 Z M 415.5 675.5 L 434.5 675.5 L 434.5 694.5 L 415.5 694.5 Z M 364.5 675.5 L 383.5 675.5 L 383.5 694.5 L 364.5 694.5 Z M 313.5 675.5 L 332.5 675.5 L 332.5 694.5 L 313.5 694.5 Z M 262.5 675.5 L 281.5 675.5 L 281.5 694.5 L 262.5 694.5 Z M 262.5 675.5 "/>
 </clipPath>
-<image id="image518" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image546" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image518"/>
+  <use xlink:href="#image546"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface512">
+<g id="surface540">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -235,6 +235,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 239.148438 687.707031 L 239.113281 688.292969 L 239.019531 688.820312 L 238.855469 689.3125 L 238.636719 689.75 L 238.347656 690.167969 L 238 690.535156 L 237.617188 690.84375 L 237.214844 691.082031 L 236.757812 691.261719 L 236.285156 691.410156 L 235.773438 691.480469 L 235.226562 691.5 L 229.230469 691.5 L 229.230469 678.207031 L 234.625 678.207031 L 235.410156 678.261719 L 236.101562 678.390625 L 236.722656 678.609375 L 237.25 678.917969 L 237.707031 679.320312 L 238.070312 679.8125 L 238.21875 680.085938 L 238.347656 680.378906 L 238.4375 680.652344 L 238.511719 680.960938 L 238.546875 681.269531 L 238.566406 681.582031 L 238.511719 682.238281 L 238.347656 682.804688 L 238.089844 683.332031 L 237.726562 683.769531 L 237.269531 684.171875 L 236.722656 684.480469 L 237.25 684.71875 L 237.707031 684.972656 L 238.109375 685.265625 L 238.4375 685.59375 L 238.691406 685.9375 L 238.894531 686.304688 L 238.964844 686.523438 L 239.074219 686.960938 L 239.113281 687.214844 L 239.128906 687.453125 Z M 236.867188 681.820312 L 236.8125 681.269531 L 236.648438 680.816406 L 236.394531 680.414062 L 236.03125 680.121094 L 235.574219 679.902344 L 235.007812 679.757812 L 234.882812 679.757812 L 234.753906 679.738281 L 234.625 679.722656 L 234.335938 679.722656 L 234.207031 679.703125 L 230.925781 679.703125 L 230.925781 683.933594 L 234.207031 683.933594 L 234.882812 683.898438 L 235.464844 683.789062 L 235.957031 683.585938 L 236.320312 683.3125 L 236.613281 682.949219 L 236.796875 682.511719 L 236.8125 682.421875 L 236.851562 682.203125 L 236.851562 681.945312 Z M 235.0625 690.003906 L 235.574219 689.988281 L 236.03125 689.878906 L 236.429688 689.695312 L 236.757812 689.457031 L 237.03125 689.148438 L 237.25 688.765625 L 237.304688 688.621094 L 237.34375 688.457031 L 237.398438 688.273438 L 237.414062 688.109375 L 237.433594 687.925781 L 237.453125 687.726562 L 237.414062 687.324219 L 237.34375 686.941406 L 237.214844 686.613281 L 237.03125 686.304688 L 236.796875 686.046875 L 236.523438 685.8125 L 236.320312 685.703125 L 236.101562 685.609375 L 235.867188 685.539062 L 235.609375 685.484375 L 235.335938 685.445312 L 235.0625 685.429688 L 230.925781 685.429688 L 230.925781 690.003906 Z M 235.0625 690.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 221 391 L 221 398 M 217 395 L 224 395 " 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 221 395 L 221 395 M 221 395 L 221 395 M 221 395 L 221 395 M 221 395 L 221 395 " 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 390 L 195 399 M 190 395 L 199 395 M 194 396 L 196 396 M 194 394 L 196 394 M 194 394 L 194 396 M 196 394 L 196 396 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.svg b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.svg
index 7c3fcdf..23a5fc1 100644
--- a/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hd__sedfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 372.5 L 1743.5 372.5 L 1743.5 526.5 L 174.5 526.5 Z M 942.5 526.5 L 1743.5 526.5 L 1743.5 539.5 L 942.5 539.5 Z M 174.5 526.5 L 702.5 526.5 L 702.5 539.5 L 174.5 539.5 Z M 174.5 526.5 "/>
 </clipPath>
-<image id="image515" 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="#image515"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 666.5 L 227.5 666.5 L 227.5 684.5 L 209.5 684.5 Z M 209.5 666.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image515"/>
+  <use xlink:href="#image543"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 772.5 569.5 L 787.5 569.5 L 787.5 613.5 L 772.5 613.5 Z M 815.5 569.5 L 831.5 569.5 L 831.5 613.5 L 815.5 613.5 Z M 853.5 569.5 L 868.5 569.5 L 868.5 613.5 L 853.5 613.5 Z M 1309.5 613.5 L 1325.5 613.5 L 1325.5 650.5 L 1309.5 650.5 Z M 1254.5 613.5 L 1270.5 613.5 L 1270.5 650.5 L 1254.5 650.5 Z M 1456.5 607.5 L 1472.5 607.5 L 1472.5 650.5 L 1456.5 650.5 Z M 1359.5 607.5 L 1374.5 607.5 L 1374.5 650.5 L 1359.5 650.5 Z M 414.5 607.5 L 429.5 607.5 L 429.5 650.5 L 414.5 650.5 Z M 376.5 607.5 L 392.5 607.5 L 392.5 650.5 L 376.5 650.5 Z M 1204.5 607.5 L 1220.5 607.5 L 1220.5 650.5 L 1204.5 650.5 Z M 279.5 607.5 L 294.5 607.5 L 294.5 650.5 L 279.5 650.5 Z M 1044.5 607.5 L 1060.5 607.5 L 1060.5 650.5 L 1044.5 650.5 Z M 557.5 607.5 L 573.5 607.5 L 573.5 650.5 L 557.5 650.5 Z M 511.5 607.5 L 527.5 607.5 L 527.5 650.5 L 511.5 650.5 Z M 610.5 607.5 L 626.5 607.5 L 626.5 650.5 L 610.5 650.5 Z M 654.5 607.5 L 669.5 607.5 L 669.5 650.5 L 654.5 650.5 Z M 235.5 607.5 L 251.5 607.5 L 251.5 650.5 L 235.5 650.5 Z M 1106.5 584.5 L 1122.5 584.5 L 1122.5 650.5 L 1106.5 650.5 Z M 1507.5 583.5 L 1522.5 583.5 L 1522.5 650.5 L 1507.5 650.5 Z M 1638.5 583.5 L 1653.5 583.5 L 1653.5 650.5 L 1638.5 650.5 Z M 1594.5 583.5 L 1610.5 583.5 L 1610.5 650.5 L 1594.5 650.5 Z M 1550.5 583.5 L 1566.5 583.5 L 1566.5 650.5 L 1550.5 650.5 Z M 944.5 613.5 L 959.5 613.5 L 959.5 650.5 L 944.5 650.5 Z M 989.5 613.5 L 1005.5 613.5 L 1005.5 650.5 L 989.5 650.5 Z M 989.5 613.5 "/>
 </clipPath>
-<image id="image516" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image544" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image516"/>
+  <use xlink:href="#image544"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1347.5 417.5 L 1362.5 417.5 L 1362.5 460.5 L 1347.5 460.5 Z M 1244.5 417.5 L 1260.5 417.5 L 1260.5 460.5 L 1244.5 460.5 Z M 1197.5 417.5 L 1212.5 417.5 L 1212.5 460.5 L 1197.5 460.5 Z M 1030.5 417.5 L 1046.5 417.5 L 1046.5 460.5 L 1030.5 460.5 Z M 1288.5 417.5 L 1303.5 417.5 L 1303.5 460.5 L 1288.5 460.5 Z M 977.5 417.5 L 992.5 417.5 L 992.5 460.5 L 977.5 460.5 Z M 930.5 417.5 L 945.5 417.5 L 945.5 460.5 L 930.5 460.5 Z M 761.5 417.5 L 777.5 417.5 L 777.5 483.5 L 761.5 483.5 Z M 658.5 417.5 L 673.5 417.5 L 673.5 483.5 L 658.5 483.5 Z M 610.5 417.5 L 626.5 417.5 L 626.5 483.5 L 610.5 483.5 Z M 818.5 417.5 L 833.5 417.5 L 833.5 483.5 L 818.5 483.5 Z M 868.5 417.5 L 883.5 417.5 L 883.5 483.5 L 868.5 483.5 Z M 511.5 417.5 L 527.5 417.5 L 527.5 483.5 L 511.5 483.5 Z M 414.5 417.5 L 429.5 417.5 L 429.5 483.5 L 414.5 483.5 Z M 376.5 417.5 L 392.5 417.5 L 392.5 483.5 L 376.5 483.5 Z M 557.5 417.5 L 573.5 417.5 L 573.5 483.5 L 557.5 483.5 Z M 1456.5 417.5 L 1472.5 417.5 L 1472.5 483.5 L 1456.5 483.5 Z M 279.5 420.5 L 294.5 420.5 L 294.5 486.5 L 279.5 486.5 Z M 235.5 420.5 L 251.5 420.5 L 251.5 486.5 L 235.5 486.5 Z M 1099.5 417.5 L 1115.5 417.5 L 1115.5 495.5 L 1099.5 495.5 Z M 1594.5 417.5 L 1610.5 417.5 L 1610.5 521.5 L 1594.5 521.5 Z M 1550.5 417.5 L 1566.5 417.5 L 1566.5 521.5 L 1550.5 521.5 Z M 1507.5 417.5 L 1522.5 417.5 L 1522.5 521.5 L 1507.5 521.5 Z M 1638.5 417.5 L 1653.5 417.5 L 1653.5 521.5 L 1638.5 521.5 Z M 1638.5 417.5 "/>
 </clipPath>
-<image id="image517" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image545" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image517"/>
+  <use xlink:href="#image545"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 209.5 383.5 L 227.5 383.5 L 227.5 401.5 L 209.5 401.5 Z M 1691.5 383.5 L 1708.5 383.5 L 1708.5 401.5 L 1691.5 401.5 Z M 1643.5 383.5 L 1661.5 383.5 L 1661.5 401.5 L 1643.5 401.5 Z M 1595.5 383.5 L 1613.5 383.5 L 1613.5 401.5 L 1595.5 401.5 Z M 1547.5 383.5 L 1565.5 383.5 L 1565.5 401.5 L 1547.5 401.5 Z M 1500.5 383.5 L 1517.5 383.5 L 1517.5 401.5 L 1500.5 401.5 Z M 1452.5 383.5 L 1469.5 383.5 L 1469.5 401.5 L 1452.5 401.5 Z M 1404.5 383.5 L 1422.5 383.5 L 1422.5 401.5 L 1404.5 401.5 Z M 1356.5 383.5 L 1374.5 383.5 L 1374.5 401.5 L 1356.5 401.5 Z M 1308.5 383.5 L 1326.5 383.5 L 1326.5 401.5 L 1308.5 401.5 Z M 1261.5 383.5 L 1278.5 383.5 L 1278.5 401.5 L 1261.5 401.5 Z M 1213.5 383.5 L 1230.5 383.5 L 1230.5 401.5 L 1213.5 401.5 Z M 1165.5 383.5 L 1183.5 383.5 L 1183.5 401.5 L 1165.5 401.5 Z M 1117.5 383.5 L 1135.5 383.5 L 1135.5 401.5 L 1117.5 401.5 Z M 1069.5 383.5 L 1087.5 383.5 L 1087.5 401.5 L 1069.5 401.5 Z M 1022.5 383.5 L 1039.5 383.5 L 1039.5 401.5 L 1022.5 401.5 Z M 974.5 383.5 L 991.5 383.5 L 991.5 401.5 L 974.5 401.5 Z M 926.5 383.5 L 944.5 383.5 L 944.5 401.5 L 926.5 401.5 Z M 878.5 383.5 L 896.5 383.5 L 896.5 401.5 L 878.5 401.5 Z M 830.5 383.5 L 848.5 383.5 L 848.5 401.5 L 830.5 401.5 Z M 783.5 383.5 L 800.5 383.5 L 800.5 401.5 L 783.5 401.5 Z M 735.5 383.5 L 752.5 383.5 L 752.5 401.5 L 735.5 401.5 Z M 687.5 383.5 L 705.5 383.5 L 705.5 401.5 L 687.5 401.5 Z M 639.5 383.5 L 657.5 383.5 L 657.5 401.5 L 639.5 401.5 Z M 591.5 383.5 L 609.5 383.5 L 609.5 401.5 L 591.5 401.5 Z M 544.5 383.5 L 561.5 383.5 L 561.5 401.5 L 544.5 401.5 Z M 496.5 383.5 L 513.5 383.5 L 513.5 401.5 L 496.5 401.5 Z M 448.5 383.5 L 466.5 383.5 L 466.5 401.5 L 448.5 401.5 Z M 400.5 383.5 L 418.5 383.5 L 418.5 401.5 L 400.5 401.5 Z M 352.5 383.5 L 370.5 383.5 L 370.5 401.5 L 352.5 401.5 Z M 305.5 383.5 L 322.5 383.5 L 322.5 401.5 L 305.5 401.5 Z M 257.5 383.5 L 274.5 383.5 L 274.5 401.5 L 257.5 401.5 Z M 974.5 472.5 L 992.5 472.5 L 992.5 485.5 L 974.5 485.5 Z M 974.5 485.5 L 992.5 485.5 L 992.5 489.5 L 974.5 489.5 Z M 260.5 472.5 L 278.5 472.5 L 278.5 489.5 L 260.5 489.5 Z M 1243.5 472.5 L 1261.5 472.5 L 1261.5 489.5 L 1243.5 489.5 Z M 299.5 507.5 L 317.5 507.5 L 317.5 525.5 L 299.5 525.5 Z M 1287.5 507.5 L 1305.5 507.5 L 1305.5 525.5 L 1287.5 525.5 Z M 932.5 507.5 L 949.5 507.5 L 949.5 525.5 L 932.5 525.5 Z M 589.5 578.5 L 607.5 578.5 L 607.5 595.5 L 589.5 595.5 Z M 1441.5 578.5 L 1459.5 578.5 L 1459.5 595.5 L 1441.5 595.5 Z M 673.5 613.5 L 691.5 613.5 L 691.5 620.5 L 673.5 620.5 Z M 629.5 613.5 L 646.5 613.5 L 646.5 620.5 L 629.5 620.5 Z M 629.5 620.5 L 646.5 620.5 L 646.5 631.5 L 629.5 631.5 Z M 673.5 620.5 L 691.5 620.5 L 691.5 631.5 L 673.5 631.5 Z M 335.5 613.5 L 352.5 613.5 L 352.5 631.5 L 335.5 631.5 Z M 872.5 613.5 L 890.5 613.5 L 890.5 631.5 L 872.5 631.5 Z M 209.5 666.5 L 227.5 666.5 L 227.5 684.5 L 209.5 684.5 Z M 1691.5 666.5 L 1708.5 666.5 L 1708.5 684.5 L 1691.5 684.5 Z M 1643.5 666.5 L 1661.5 666.5 L 1661.5 684.5 L 1643.5 684.5 Z M 1595.5 666.5 L 1613.5 666.5 L 1613.5 684.5 L 1595.5 684.5 Z M 1547.5 666.5 L 1565.5 666.5 L 1565.5 684.5 L 1547.5 684.5 Z M 1500.5 666.5 L 1517.5 666.5 L 1517.5 684.5 L 1500.5 684.5 Z M 1452.5 666.5 L 1469.5 666.5 L 1469.5 684.5 L 1452.5 684.5 Z M 1404.5 666.5 L 1422.5 666.5 L 1422.5 684.5 L 1404.5 684.5 Z M 1356.5 666.5 L 1374.5 666.5 L 1374.5 684.5 L 1356.5 684.5 Z M 1308.5 666.5 L 1326.5 666.5 L 1326.5 684.5 L 1308.5 684.5 Z M 1261.5 666.5 L 1278.5 666.5 L 1278.5 684.5 L 1261.5 684.5 Z M 1213.5 666.5 L 1230.5 666.5 L 1230.5 684.5 L 1213.5 684.5 Z M 1165.5 666.5 L 1183.5 666.5 L 1183.5 684.5 L 1165.5 684.5 Z M 1117.5 666.5 L 1135.5 666.5 L 1135.5 684.5 L 1117.5 684.5 Z M 1069.5 666.5 L 1087.5 666.5 L 1087.5 684.5 L 1069.5 684.5 Z M 1022.5 666.5 L 1039.5 666.5 L 1039.5 684.5 L 1022.5 684.5 Z M 974.5 666.5 L 991.5 666.5 L 991.5 684.5 L 974.5 684.5 Z M 926.5 666.5 L 944.5 666.5 L 944.5 684.5 L 926.5 684.5 Z M 878.5 666.5 L 896.5 666.5 L 896.5 684.5 L 878.5 684.5 Z M 830.5 666.5 L 848.5 666.5 L 848.5 684.5 L 830.5 684.5 Z M 783.5 666.5 L 800.5 666.5 L 800.5 684.5 L 783.5 684.5 Z M 735.5 666.5 L 752.5 666.5 L 752.5 684.5 L 735.5 684.5 Z M 687.5 666.5 L 705.5 666.5 L 705.5 684.5 L 687.5 684.5 Z M 639.5 666.5 L 657.5 666.5 L 657.5 684.5 L 639.5 684.5 Z M 591.5 666.5 L 609.5 666.5 L 609.5 684.5 L 591.5 684.5 Z M 544.5 666.5 L 561.5 666.5 L 561.5 684.5 L 544.5 684.5 Z M 496.5 666.5 L 513.5 666.5 L 513.5 684.5 L 496.5 684.5 Z M 448.5 666.5 L 466.5 666.5 L 466.5 684.5 L 448.5 684.5 Z M 400.5 666.5 L 418.5 666.5 L 418.5 684.5 L 400.5 684.5 Z M 352.5 666.5 L 370.5 666.5 L 370.5 684.5 L 352.5 684.5 Z M 305.5 666.5 L 322.5 666.5 L 322.5 684.5 L 305.5 684.5 Z M 257.5 666.5 L 274.5 666.5 L 274.5 684.5 L 257.5 684.5 Z M 257.5 666.5 "/>
 </clipPath>
-<image id="image518" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image546" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image518"/>
+  <use xlink:href="#image546"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface512">
+<g id="surface540">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -235,6 +235,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 234.328125 678 L 234.296875 678.539062 L 234.210938 679.027344 L 234.058594 679.480469 L 233.859375 679.882812 L 233.589844 680.269531 L 233.269531 680.609375 L 232.914062 680.894531 L 232.542969 681.113281 L 232.125 681.28125 L 231.6875 681.414062 L 231.214844 681.484375 L 230.710938 681.5 L 225.171875 681.5 L 225.171875 669.230469 L 230.15625 669.230469 L 230.878906 669.28125 L 231.519531 669.398438 L 232.089844 669.601562 L 232.578125 669.886719 L 233 670.257812 L 233.335938 670.710938 L 233.46875 670.964844 L 233.589844 671.234375 L 233.671875 671.484375 L 233.738281 671.773438 L 233.773438 672.058594 L 233.789062 672.34375 L 233.738281 672.949219 L 233.589844 673.472656 L 233.351562 673.960938 L 233.015625 674.363281 L 232.59375 674.734375 L 232.089844 675.019531 L 232.578125 675.238281 L 233 675.476562 L 233.371094 675.742188 L 233.671875 676.046875 L 233.90625 676.367188 L 234.09375 676.703125 L 234.160156 676.90625 L 234.210938 677.105469 L 234.261719 677.308594 L 234.296875 677.542969 L 234.3125 677.765625 Z M 232.226562 672.5625 L 232.175781 672.058594 L 232.023438 671.636719 L 231.789062 671.265625 L 231.449219 670.996094 L 231.03125 670.796875 L 230.507812 670.660156 L 230.390625 670.660156 L 230.15625 670.628906 L 229.886719 670.628906 L 229.769531 670.609375 L 226.738281 670.609375 L 226.738281 674.515625 L 229.769531 674.515625 L 230.390625 674.480469 L 230.929688 674.378906 L 231.382812 674.195312 L 231.71875 673.941406 L 231.988281 673.605469 L 232.15625 673.203125 L 232.175781 673.117188 L 232.191406 673.015625 L 232.207031 672.917969 L 232.207031 672.679688 Z M 230.558594 680.121094 L 231.03125 680.101562 L 231.449219 680.003906 L 231.820312 679.832031 L 232.125 679.613281 L 232.375 679.328125 L 232.578125 678.976562 L 232.628906 678.839844 L 232.664062 678.6875 L 232.714844 678.519531 L 232.730469 678.371094 L 232.746094 678.203125 L 232.765625 678.015625 L 232.730469 677.644531 L 232.664062 677.292969 L 232.542969 676.988281 L 232.375 676.703125 L 232.15625 676.46875 L 231.90625 676.25 L 231.71875 676.148438 L 231.519531 676.0625 L 231.300781 675.996094 L 231.0625 675.945312 L 230.8125 675.914062 L 230.558594 675.894531 L 226.738281 675.894531 L 226.738281 680.121094 Z M 230.558594 680.121094 "/>
 <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 218 400 L 218 407 M 214 404 L 221 404 " 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 218 404 L 218 404 M 218 404 L 218 404 M 218 404 L 218 404 M 218 404 L 218 404 " 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 194 399 L 194 408 M 189 404 L 198 404 M 193 405 L 195 405 M 193 403 L 195 403 M 193 403 L 193 405 M 195 403 L 195 405 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tap/sky130_fd_sc_hd__tap_1.svg b/cells/tap/sky130_fd_sc_hd__tap_1.svg
index 2c47c96..7c6bcf5 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_1.svg
+++ b/cells/tap/sky130_fd_sc_hd__tap_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 850.5 112.5 L 1080.5 112.5 L 1080.5 551.5 L 850.5 551.5 Z M 850.5 112.5 "/>
 </clipPath>
-<image id="image245" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image286" 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="#image245"/>
+  <use xlink:href="#image286"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 942.5 252.5 L 988.5 252.5 L 988.5 297.5 L 942.5 297.5 Z M 942.5 297.5 L 988.5 297.5 L 988.5 343.5 L 942.5 343.5 Z M 942.5 343.5 L 988.5 343.5 L 988.5 412.5 L 942.5 412.5 Z M 942.5 412.5 L 988.5 412.5 L 988.5 458.5 L 942.5 458.5 Z M 942.5 458.5 L 988.5 458.5 L 988.5 491.5 L 942.5 491.5 Z M 942.5 458.5 "/>
 </clipPath>
-<image id="image246" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image287" 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="#image246"/>
+  <use xlink:href="#image287"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 942.5 677.5 L 988.5 677.5 L 988.5 710.5 L 942.5 710.5 Z M 942.5 710.5 L 988.5 710.5 L 988.5 756.5 L 942.5 756.5 Z M 942.5 756.5 L 988.5 756.5 L 988.5 821.5 L 942.5 821.5 Z M 942.5 756.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image246"/>
+  <use xlink:href="#image287"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image247" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image247"/>
+  <use xlink:href="#image288"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface242">
+<g id="surface283">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -99,6 +99,5 @@
 <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 942 699 L 980 699 M 942 666 L 980 666 M 942 666 L 942 699 M 980 666 L 980 699 " 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 942 699 L 980 699 M 942 666 L 980 666 M 980 699 L 980 666 M 942 699 L 942 666 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 167 L 902 174 M 898 171 L 905 171 " 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 902 166 L 902 175 M 897 171 L 906 171 M 901 172 L 903 172 M 901 170 L 903 170 M 901 170 L 901 172 M 903 170 L 903 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tap/sky130_fd_sc_hd__tap_2.svg b/cells/tap/sky130_fd_sc_hd__tap_2.svg
index a546baf..4674a19 100644
--- a/cells/tap/sky130_fd_sc_hd__tap_2.svg
+++ b/cells/tap/sky130_fd_sc_hd__tap_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 787.5 112.5 L 1143.5 112.5 L 1143.5 551.5 L 787.5 551.5 Z M 787.5 112.5 "/>
 </clipPath>
-<image id="image255" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image298" 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="#image255"/>
+  <use xlink:href="#image298"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 879.5 252.5 L 1051.5 252.5 L 1051.5 297.5 L 879.5 297.5 Z M 879.5 297.5 L 1051.5 297.5 L 1051.5 343.5 L 879.5 343.5 Z M 879.5 343.5 L 1051.5 343.5 L 1051.5 412.5 L 879.5 412.5 Z M 879.5 412.5 L 1051.5 412.5 L 1051.5 458.5 L 879.5 458.5 Z M 879.5 458.5 L 1051.5 458.5 L 1051.5 491.5 L 879.5 491.5 Z M 879.5 458.5 "/>
 </clipPath>
-<image id="image256" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image299" 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="#image256"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 879.5 677.5 L 1051.5 677.5 L 1051.5 710.5 L 879.5 710.5 Z M 879.5 710.5 L 1051.5 710.5 L 1051.5 756.5 L 879.5 756.5 Z M 879.5 756.5 L 1051.5 756.5 L 1051.5 821.5 L 879.5 821.5 Z M 879.5 756.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image256"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 879.5 141.5 L 925.5 141.5 L 925.5 187.5 L 879.5 187.5 Z M 1005.5 141.5 L 1051.5 141.5 L 1051.5 187.5 L 1005.5 187.5 Z M 879.5 885.5 L 925.5 885.5 L 925.5 931.5 L 879.5 931.5 Z M 1005.5 885.5 L 1051.5 885.5 L 1051.5 931.5 L 1005.5 931.5 Z M 1005.5 885.5 "/>
 </clipPath>
-<image id="image257" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image257"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface252">
+<g id="surface295">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -104,6 +104,5 @@
 <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 1014 792 L 1044 792 M 1014 752 L 1044 752 M 1014 752 L 1014 792 M 1044 752 L 1044 792 " 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 1014 792 L 1044 792 M 1014 752 L 1044 752 M 1044 792 L 1044 752 M 1014 792 L 1014 752 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 839 167 L 839 174 M 835 171 L 842 171 " 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 839 166 L 839 175 M 834 171 L 843 171 M 838 172 L 840 172 M 838 170 L 840 170 M 838 170 L 838 172 M 840 170 L 840 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.svg b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.svg
index 45d82c0..ddaa6c4 100644
--- a/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.svg
+++ b/cells/tapvgnd/sky130_fd_sc_hd__tapvgnd_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 850.5 112.5 L 1080.5 112.5 L 1080.5 551.5 L 850.5 551.5 Z M 850.5 112.5 "/>
 </clipPath>
-<image id="image239" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image268" 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="#image239"/>
+  <use xlink:href="#image268"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 942.5 252.5 L 988.5 252.5 L 988.5 297.5 L 942.5 297.5 Z M 942.5 297.5 L 988.5 297.5 L 988.5 343.5 L 942.5 343.5 Z M 942.5 343.5 L 988.5 343.5 L 988.5 412.5 L 942.5 412.5 Z M 942.5 412.5 L 988.5 412.5 L 988.5 458.5 L 942.5 458.5 Z M 942.5 458.5 L 988.5 458.5 L 988.5 491.5 L 942.5 491.5 Z M 942.5 458.5 "/>
 </clipPath>
-<image id="image240" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image269" 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="#image240"/>
+  <use xlink:href="#image269"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 942.5 677.5 L 988.5 677.5 L 988.5 710.5 L 942.5 710.5 Z M 942.5 710.5 L 988.5 710.5 L 988.5 756.5 L 942.5 756.5 Z M 942.5 756.5 L 988.5 756.5 L 988.5 821.5 L 942.5 821.5 Z M 942.5 756.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image240"/>
+  <use xlink:href="#image269"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 942.5 280.5 L 988.5 280.5 L 988.5 297.5 L 942.5 297.5 Z M 942.5 297.5 L 988.5 297.5 L 988.5 327.5 L 942.5 327.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image241" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image270" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image241"/>
+  <use xlink:href="#image270"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface236">
+<g id="surface265">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -94,6 +94,5 @@
 <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 945 935 L 986 935 M 945 893 L 986 893 M 945 893 L 945 935 M 986 893 L 986 935 " 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 945 935 L 986 935 M 945 893 L 986 893 M 986 935 L 986 893 M 945 935 L 945 893 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 167 L 902 174 M 898 171 L 905 171 " 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 902 166 L 902 175 M 897 171 L 906 171 M 901 172 L 903 172 M 901 170 L 903 170 M 901 170 L 901 172 M 903 170 L 903 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.svg b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.svg
index 8397d3a..34caf1d 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.svg
+++ b/cells/tapvgnd2/sky130_fd_sc_hd__tapvgnd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 850.5 112.5 L 1080.5 112.5 L 1080.5 551.5 L 850.5 551.5 Z M 850.5 112.5 "/>
 </clipPath>
-<image id="image240" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image270" 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="#image240"/>
+  <use xlink:href="#image270"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 942.5 252.5 L 988.5 252.5 L 988.5 297.5 L 942.5 297.5 Z M 942.5 297.5 L 988.5 297.5 L 988.5 343.5 L 942.5 343.5 Z M 942.5 343.5 L 988.5 343.5 L 988.5 412.5 L 942.5 412.5 Z M 942.5 412.5 L 988.5 412.5 L 988.5 458.5 L 942.5 458.5 Z M 942.5 458.5 L 988.5 458.5 L 988.5 491.5 L 942.5 491.5 Z M 942.5 458.5 "/>
 </clipPath>
-<image id="image241" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image271" 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="#image241"/>
+  <use xlink:href="#image271"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 942.5 677.5 L 988.5 677.5 L 988.5 710.5 L 942.5 710.5 Z M 942.5 710.5 L 988.5 710.5 L 988.5 756.5 L 942.5 756.5 Z M 942.5 756.5 L 988.5 756.5 L 988.5 821.5 L 942.5 821.5 Z M 942.5 756.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image241"/>
+  <use xlink:href="#image271"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 942.5 373.5 L 988.5 373.5 L 988.5 412.5 L 942.5 412.5 Z M 942.5 412.5 L 988.5 412.5 L 988.5 420.5 L 942.5 420.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image242" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image242"/>
+  <use xlink:href="#image272"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface237">
+<g id="surface267">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -94,6 +94,5 @@
 <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 942 926 L 994 926 M 942 900 L 994 900 M 942 900 L 942 926 M 994 900 L 994 926 " 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 942 926 L 994 926 M 942 900 L 994 900 M 994 926 L 994 900 M 942 926 L 942 900 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 167 L 902 174 M 898 171 L 905 171 " 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 902 166 L 902 175 M 897 171 L 906 171 M 901 172 L 903 172 M 901 170 L 903 170 M 901 170 L 901 172 M 903 170 L 903 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.svg b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.svg
index 8c761fc..15bf0e2 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.svg
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hd__tapvpwrvgnd_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 850.5 112.5 L 1080.5 112.5 L 1080.5 551.5 L 850.5 551.5 Z M 850.5 112.5 "/>
 </clipPath>
-<image id="image232" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image262" 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="#image232"/>
+  <use xlink:href="#image262"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 942.5 252.5 L 988.5 252.5 L 988.5 284.5 L 942.5 284.5 Z M 942.5 284.5 L 988.5 284.5 L 988.5 331.5 L 942.5 331.5 Z M 942.5 331.5 L 988.5 331.5 L 988.5 412.5 L 942.5 412.5 Z M 942.5 412.5 L 988.5 412.5 L 988.5 458.5 L 942.5 458.5 Z M 942.5 458.5 L 988.5 458.5 L 988.5 491.5 L 942.5 491.5 Z M 942.5 458.5 "/>
 </clipPath>
-<image id="image233" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image263" 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="#image233"/>
+  <use xlink:href="#image263"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 942.5 677.5 L 988.5 677.5 L 988.5 710.5 L 942.5 710.5 Z M 942.5 710.5 L 988.5 710.5 L 988.5 756.5 L 942.5 756.5 Z M 942.5 756.5 L 988.5 756.5 L 988.5 821.5 L 942.5 821.5 Z M 942.5 756.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image233"/>
+  <use xlink:href="#image263"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 942.5 141.5 L 988.5 141.5 L 988.5 187.5 L 942.5 187.5 Z M 942.5 885.5 L 988.5 885.5 L 988.5 931.5 L 942.5 931.5 Z M 942.5 885.5 "/>
 </clipPath>
-<image id="image234" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image264" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image234"/>
+  <use xlink:href="#image264"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface229">
+<g id="surface259">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -89,6 +89,5 @@
 <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 931 198 L 1001 198 M 931 146 L 1001 146 M 931 146 L 931 198 M 1001 146 L 1001 198 " 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 931 198 L 1001 198 M 931 146 L 1001 146 M 1001 198 L 1001 146 M 931 198 L 931 146 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 167 L 902 174 M 898 171 L 905 171 " 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 902 166 L 902 175 M 897 171 L 906 171 M 901 172 L 903 172 M 901 170 L 903 170 M 901 170 L 901 172 M 903 170 L 903 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.svg b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.svg
index 3f147fa..d79f62b 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_1.svg
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1243.5 666.5 L 1284.5 666.5 L 1284.5 844.5 L 1243.5 844.5 Z M 657.5 666.5 L 698.5 666.5 L 698.5 844.5 L 657.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 871.5 666.5 L 912.5 666.5 L 912.5 844.5 L 871.5 844.5 Z M 1128.5 666.5 L 1169.5 666.5 L 1169.5 844.5 L 1128.5 844.5 Z M 1128.5 666.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1226.5 228.5 L 1267.5 228.5 L 1267.5 502.5 L 1226.5 502.5 Z M 641.5 228.5 L 682.5 228.5 L 682.5 502.5 L 641.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 997.5 228.5 L 1038.5 228.5 L 1038.5 502.5 L 997.5 502.5 Z M 1095.5 228.5 L 1136.5 228.5 L 1136.5 502.5 L 1095.5 502.5 Z M 1095.5 228.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.svg b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.svg
index 223a48e..a102b81 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_2.svg
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1530.5 653.5 L 1567.5 653.5 L 1567.5 813.5 L 1530.5 813.5 Z M 323.5 653.5 L 360.5 653.5 L 360.5 813.5 L 323.5 813.5 Z M 426.5 653.5 L 463.5 653.5 L 463.5 813.5 L 426.5 813.5 Z M 530.5 653.5 L 567.5 653.5 L 567.5 813.5 L 530.5 813.5 Z M 634.5 653.5 L 671.5 653.5 L 671.5 813.5 L 634.5 813.5 Z M 875.5 653.5 L 912.5 653.5 L 912.5 813.5 L 875.5 813.5 Z M 979.5 653.5 L 1016.5 653.5 L 1016.5 813.5 L 979.5 813.5 Z M 1082.5 653.5 L 1119.5 653.5 L 1119.5 813.5 L 1082.5 813.5 Z M 1195.5 653.5 L 1232.5 653.5 L 1232.5 813.5 L 1195.5 813.5 Z M 1426.5 653.5 L 1463.5 653.5 L 1463.5 813.5 L 1426.5 813.5 Z M 1426.5 653.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1530.5 258.5 L 1567.5 258.5 L 1567.5 505.5 L 1530.5 505.5 Z M 323.5 258.5 L 360.5 258.5 L 360.5 505.5 L 323.5 505.5 Z M 426.5 258.5 L 463.5 258.5 L 463.5 505.5 L 426.5 505.5 Z M 530.5 258.5 L 567.5 258.5 L 567.5 505.5 L 530.5 505.5 Z M 634.5 258.5 L 671.5 258.5 L 671.5 505.5 L 634.5 505.5 Z M 875.5 258.5 L 912.5 258.5 L 912.5 505.5 L 875.5 505.5 Z M 979.5 258.5 L 1016.5 258.5 L 1016.5 505.5 L 979.5 505.5 Z M 1082.5 258.5 L 1119.5 258.5 L 1119.5 505.5 L 1082.5 505.5 Z M 1195.5 258.5 L 1232.5 258.5 L 1232.5 505.5 L 1195.5 505.5 Z M 1426.5 258.5 L 1463.5 258.5 L 1463.5 505.5 L 1426.5 505.5 Z M 1426.5 258.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 830.5 305.5 L 872.5 305.5 L 872.5 325.5 L 830.5 325.5 Z M 1057.5 305.5 L 1098.5 305.5 L 1098.5 325.5 L 1057.5 325.5 Z M 1057.5 325.5 L 1098.5 325.5 L 1098.5 347.5 L 1057.5 347.5 Z M 830.5 325.5 L 872.5 325.5 L 872.5 347.5 L 830.5 347.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 257 229 L 299 229 M 257 187 L 299 187 M 257 187 L 257 229 M 299 187 L 299 229 " 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 257 229 L 299 229 M 257 187 L 299 187 M 299 229 L 299 187 M 257 229 L 257 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.svg b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.svg
index ca3fd88..268085e 100644
--- a/cells/xnor2/sky130_fd_sc_hd__xnor2_4.svg
+++ b/cells/xnor2/sky130_fd_sc_hd__xnor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" 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="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1625.5 605.5 L 1648.5 605.5 L 1648.5 702.5 L 1625.5 702.5 Z M 273.5 605.5 L 296.5 605.5 L 296.5 702.5 L 273.5 702.5 Z M 336.5 605.5 L 358.5 605.5 L 358.5 702.5 L 336.5 702.5 Z M 399.5 605.5 L 421.5 605.5 L 421.5 702.5 L 399.5 702.5 Z M 462.5 605.5 L 484.5 605.5 L 484.5 702.5 L 462.5 702.5 Z M 524.5 605.5 L 547.5 605.5 L 547.5 702.5 L 524.5 702.5 Z M 587.5 605.5 L 609.5 605.5 L 609.5 702.5 L 587.5 702.5 Z M 650.5 605.5 L 672.5 605.5 L 672.5 702.5 L 650.5 702.5 Z M 713.5 605.5 L 735.5 605.5 L 735.5 702.5 L 713.5 702.5 Z M 854.5 605.5 L 877.5 605.5 L 877.5 702.5 L 854.5 702.5 Z M 917.5 605.5 L 940.5 605.5 L 940.5 702.5 L 917.5 702.5 Z M 980.5 605.5 L 1002.5 605.5 L 1002.5 702.5 L 980.5 702.5 Z M 1043.5 605.5 L 1065.5 605.5 L 1065.5 702.5 L 1043.5 702.5 Z M 1105.5 605.5 L 1128.5 605.5 L 1128.5 702.5 L 1105.5 702.5 Z M 1168.5 605.5 L 1191.5 605.5 L 1191.5 702.5 L 1168.5 702.5 Z M 1231.5 605.5 L 1253.5 605.5 L 1253.5 702.5 L 1231.5 702.5 Z M 1294.5 605.5 L 1316.5 605.5 L 1316.5 702.5 L 1294.5 702.5 Z M 1437.5 605.5 L 1460.5 605.5 L 1460.5 702.5 L 1437.5 702.5 Z M 1500.5 605.5 L 1522.5 605.5 L 1522.5 702.5 L 1500.5 702.5 Z M 1563.5 605.5 L 1585.5 605.5 L 1585.5 702.5 L 1563.5 702.5 Z M 1563.5 605.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1625.5 366.5 L 1648.5 366.5 L 1648.5 516.5 L 1625.5 516.5 Z M 273.5 366.5 L 296.5 366.5 L 296.5 516.5 L 273.5 516.5 Z M 336.5 366.5 L 358.5 366.5 L 358.5 516.5 L 336.5 516.5 Z M 399.5 366.5 L 421.5 366.5 L 421.5 516.5 L 399.5 516.5 Z M 462.5 366.5 L 484.5 366.5 L 484.5 516.5 L 462.5 516.5 Z M 524.5 366.5 L 547.5 366.5 L 547.5 516.5 L 524.5 516.5 Z M 587.5 366.5 L 609.5 366.5 L 609.5 516.5 L 587.5 516.5 Z M 650.5 366.5 L 672.5 366.5 L 672.5 516.5 L 650.5 516.5 Z M 713.5 366.5 L 735.5 366.5 L 735.5 516.5 L 713.5 516.5 Z M 854.5 366.5 L 877.5 366.5 L 877.5 516.5 L 854.5 516.5 Z M 917.5 366.5 L 940.5 366.5 L 940.5 516.5 L 917.5 516.5 Z M 980.5 366.5 L 1002.5 366.5 L 1002.5 516.5 L 980.5 516.5 Z M 1043.5 366.5 L 1065.5 366.5 L 1065.5 516.5 L 1043.5 516.5 Z M 1105.5 366.5 L 1128.5 366.5 L 1128.5 516.5 L 1105.5 516.5 Z M 1168.5 366.5 L 1191.5 366.5 L 1191.5 516.5 L 1168.5 516.5 Z M 1231.5 366.5 L 1253.5 366.5 L 1253.5 516.5 L 1231.5 516.5 Z M 1294.5 366.5 L 1316.5 366.5 L 1316.5 516.5 L 1294.5 516.5 Z M 1437.5 366.5 L 1460.5 366.5 L 1460.5 516.5 L 1437.5 516.5 Z M 1500.5 366.5 L 1522.5 366.5 L 1522.5 516.5 L 1500.5 516.5 Z M 1563.5 366.5 L 1585.5 366.5 L 1585.5 516.5 L 1563.5 516.5 Z M 1563.5 366.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 362.5 496.5 L 388.5 496.5 L 388.5 508.5 L 362.5 508.5 Z M 1118.5 496.5 L 1144.5 496.5 L 1144.5 522.5 L 1118.5 522.5 Z M 362.5 508.5 L 388.5 508.5 L 388.5 522.5 L 362.5 522.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 225 761 L 250 761 M 225 735 L 250 735 M 225 735 L 225 761 M 250 735 L 250 761 " 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 225 761 L 250 761 M 225 735 L 250 735 M 250 761 L 250 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.svg b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.svg
index cde2bf0..a3970e7 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_1.svg
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 254.5 L 1744.5 254.5 L 1744.5 545.5 L 175.5 545.5 Z M 175.5 254.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 235.5 766.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 378.5 621.5 L 405.5 621.5 L 405.5 697.5 L 378.5 697.5 Z M 659.5 621.5 L 687.5 621.5 L 687.5 737.5 L 659.5 737.5 Z M 1184.5 661.5 L 1211.5 661.5 L 1211.5 737.5 L 1184.5 737.5 Z M 580.5 621.5 L 607.5 621.5 L 607.5 737.5 L 580.5 737.5 Z M 1047.5 621.5 L 1074.5 621.5 L 1074.5 737.5 L 1047.5 737.5 Z M 1328.5 621.5 L 1355.5 621.5 L 1355.5 737.5 L 1328.5 737.5 Z M 1527.5 623.5 L 1554.5 623.5 L 1554.5 739.5 L 1527.5 739.5 Z M 879.5 621.5 L 906.5 621.5 L 906.5 739.5 L 879.5 739.5 Z M 281.5 621.5 L 308.5 621.5 L 308.5 739.5 L 281.5 739.5 Z M 1603.5 623.5 L 1631.5 623.5 L 1631.5 739.5 L 1603.5 739.5 Z M 1437.5 630.5 L 1464.5 630.5 L 1464.5 739.5 L 1437.5 739.5 Z M 1437.5 630.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1436.5 331.5 L 1463.5 331.5 L 1463.5 483.5 L 1436.5 483.5 Z M 1342.5 367.5 L 1370.5 367.5 L 1370.5 483.5 L 1342.5 483.5 Z M 568.5 334.5 L 595.5 334.5 L 595.5 487.5 L 568.5 487.5 Z M 1527.5 331.5 L 1554.5 331.5 L 1554.5 512.5 L 1527.5 512.5 Z M 1047.5 360.5 L 1074.5 360.5 L 1074.5 512.5 L 1047.5 512.5 Z M 656.5 360.5 L 683.5 360.5 L 683.5 512.5 L 656.5 512.5 Z M 1603.5 331.5 L 1631.5 331.5 L 1631.5 512.5 L 1603.5 512.5 Z M 848.5 331.5 L 875.5 331.5 L 875.5 512.5 L 848.5 512.5 Z M 284.5 331.5 L 311.5 331.5 L 311.5 512.5 L 284.5 512.5 Z M 378.5 396.5 L 405.5 396.5 L 405.5 512.5 L 378.5 512.5 Z M 1184.5 396.5 L 1211.5 396.5 L 1211.5 512.5 L 1184.5 512.5 Z M 1184.5 396.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 235.5 273.5 L 266.5 273.5 L 266.5 304.5 L 235.5 304.5 Z M 1652.5 273.5 L 1683.5 273.5 L 1683.5 304.5 L 1652.5 304.5 Z M 1569.5 273.5 L 1600.5 273.5 L 1600.5 304.5 L 1569.5 304.5 Z M 1486.5 273.5 L 1516.5 273.5 L 1516.5 304.5 L 1486.5 304.5 Z M 1402.5 273.5 L 1433.5 273.5 L 1433.5 304.5 L 1402.5 304.5 Z M 1319.5 273.5 L 1350.5 273.5 L 1350.5 304.5 L 1319.5 304.5 Z M 1236.5 273.5 L 1266.5 273.5 L 1266.5 304.5 L 1236.5 304.5 Z M 1152.5 273.5 L 1183.5 273.5 L 1183.5 304.5 L 1152.5 304.5 Z M 1069.5 273.5 L 1100.5 273.5 L 1100.5 304.5 L 1069.5 304.5 Z M 986.5 273.5 L 1016.5 273.5 L 1016.5 304.5 L 986.5 304.5 Z M 902.5 273.5 L 933.5 273.5 L 933.5 304.5 L 902.5 304.5 Z M 819.5 273.5 L 850.5 273.5 L 850.5 304.5 L 819.5 304.5 Z M 735.5 273.5 L 766.5 273.5 L 766.5 304.5 L 735.5 304.5 Z M 652.5 273.5 L 683.5 273.5 L 683.5 304.5 L 652.5 304.5 Z M 569.5 273.5 L 600.5 273.5 L 600.5 304.5 L 569.5 304.5 Z M 485.5 273.5 L 516.5 273.5 L 516.5 304.5 L 485.5 304.5 Z M 402.5 273.5 L 433.5 273.5 L 433.5 304.5 L 402.5 304.5 Z M 319.5 273.5 L 350.5 273.5 L 350.5 304.5 L 319.5 304.5 Z M 735.5 489.5 L 766.5 489.5 L 766.5 505.5 L 735.5 505.5 Z M 1152.5 489.5 L 1183.5 489.5 L 1183.5 519.5 L 1152.5 519.5 Z M 735.5 505.5 L 766.5 505.5 L 766.5 519.5 L 735.5 519.5 Z M 902.5 612.5 L 933.5 612.5 L 933.5 632.5 L 902.5 632.5 Z M 902.5 632.5 L 933.5 632.5 L 933.5 643.5 L 902.5 643.5 Z M 1152.5 612.5 L 1183.5 612.5 L 1183.5 643.5 L 1152.5 643.5 Z M 1402.5 612.5 L 1433.5 612.5 L 1433.5 643.5 L 1402.5 643.5 Z M 1486.5 673.5 L 1516.5 673.5 L 1516.5 683.5 L 1486.5 683.5 Z M 986.5 673.5 L 1016.5 673.5 L 1016.5 693.5 L 986.5 693.5 Z M 986.5 693.5 L 1016.5 693.5 L 1016.5 704.5 L 986.5 704.5 Z M 1486.5 683.5 L 1516.5 683.5 L 1516.5 704.5 L 1486.5 704.5 Z M 235.5 766.5 L 266.5 766.5 L 266.5 797.5 L 235.5 797.5 Z M 1652.5 766.5 L 1683.5 766.5 L 1683.5 797.5 L 1652.5 797.5 Z M 1569.5 766.5 L 1600.5 766.5 L 1600.5 797.5 L 1569.5 797.5 Z M 1486.5 766.5 L 1516.5 766.5 L 1516.5 797.5 L 1486.5 797.5 Z M 1402.5 766.5 L 1433.5 766.5 L 1433.5 797.5 L 1402.5 797.5 Z M 1319.5 766.5 L 1350.5 766.5 L 1350.5 797.5 L 1319.5 797.5 Z M 1236.5 766.5 L 1266.5 766.5 L 1266.5 797.5 L 1236.5 797.5 Z M 1152.5 766.5 L 1183.5 766.5 L 1183.5 797.5 L 1152.5 797.5 Z M 1069.5 766.5 L 1100.5 766.5 L 1100.5 797.5 L 1069.5 797.5 Z M 986.5 766.5 L 1016.5 766.5 L 1016.5 797.5 L 986.5 797.5 Z M 902.5 766.5 L 933.5 766.5 L 933.5 797.5 L 902.5 797.5 Z M 819.5 766.5 L 850.5 766.5 L 850.5 797.5 L 819.5 797.5 Z M 735.5 766.5 L 766.5 766.5 L 766.5 797.5 L 735.5 797.5 Z M 652.5 766.5 L 683.5 766.5 L 683.5 797.5 L 652.5 797.5 Z M 569.5 766.5 L 600.5 766.5 L 600.5 797.5 L 569.5 797.5 Z M 485.5 766.5 L 516.5 766.5 L 516.5 797.5 L 485.5 797.5 Z M 402.5 766.5 L 433.5 766.5 L 433.5 797.5 L 402.5 797.5 Z M 319.5 766.5 L 350.5 766.5 L 350.5 797.5 L 319.5 797.5 Z M 319.5 766.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 235 806 L 266 806 M 235 775 L 266 775 M 235 775 L 235 806 M 266 775 L 266 806 " 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 235 806 L 266 806 M 235 775 L 266 775 M 266 806 L 266 775 M 235 806 L 235 775 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 209 295 L 209 300 M 206 298 L 211 298 " 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 209 293 L 209 302 M 204 298 L 213 298 M 208 299 L 210 299 M 208 297 L 210 297 M 208 297 L 208 299 M 210 297 L 210 299 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.svg b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.svg
index 0fa972a..14a9618 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_2.svg
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 233.5 754.5 L 262.5 754.5 L 262.5 783.5 L 233.5 783.5 Z M 233.5 754.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 446.5 616.5 L 472.5 616.5 L 472.5 689.5 L 446.5 689.5 Z M 638.5 616.5 L 664.5 616.5 L 664.5 726.5 L 638.5 726.5 Z M 1349.5 616.5 L 1374.5 616.5 L 1374.5 726.5 L 1349.5 726.5 Z M 714.5 616.5 L 739.5 616.5 L 739.5 726.5 L 714.5 726.5 Z M 1082.5 616.5 L 1108.5 616.5 L 1108.5 726.5 L 1082.5 726.5 Z M 1212.5 654.5 L 1238.5 654.5 L 1238.5 726.5 L 1212.5 726.5 Z M 282.5 616.5 L 307.5 616.5 L 307.5 728.5 L 282.5 728.5 Z M 1610.5 618.5 L 1636.5 618.5 L 1636.5 728.5 L 1610.5 728.5 Z M 1452.5 625.5 L 1478.5 625.5 L 1478.5 728.5 L 1452.5 728.5 Z M 922.5 616.5 L 948.5 616.5 L 948.5 728.5 L 922.5 728.5 Z M 354.5 616.5 L 380.5 616.5 L 380.5 728.5 L 354.5 728.5 Z M 1538.5 618.5 L 1564.5 618.5 L 1564.5 728.5 L 1538.5 728.5 Z M 1538.5 618.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1451.5 341.5 L 1477.5 341.5 L 1477.5 486.5 L 1451.5 486.5 Z M 1362.5 375.5 L 1388.5 375.5 L 1388.5 486.5 L 1362.5 486.5 Z M 627.5 344.5 L 652.5 344.5 L 652.5 489.5 L 627.5 489.5 Z M 357.5 341.5 L 383.5 341.5 L 383.5 513.5 L 357.5 513.5 Z M 1082.5 369.5 L 1108.5 369.5 L 1108.5 513.5 L 1082.5 513.5 Z M 710.5 369.5 L 736.5 369.5 L 736.5 513.5 L 710.5 513.5 Z M 1538.5 341.5 L 1564.5 341.5 L 1564.5 513.5 L 1538.5 513.5 Z M 893.5 341.5 L 918.5 341.5 L 918.5 513.5 L 893.5 513.5 Z M 285.5 341.5 L 311.5 341.5 L 311.5 513.5 L 285.5 513.5 Z M 1610.5 341.5 L 1636.5 341.5 L 1636.5 513.5 L 1610.5 513.5 Z M 446.5 403.5 L 472.5 403.5 L 472.5 513.5 L 446.5 513.5 Z M 1212.5 403.5 L 1238.5 403.5 L 1238.5 513.5 L 1212.5 513.5 Z M 1212.5 403.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 786.5 491.5 L 815.5 491.5 L 815.5 506.5 L 786.5 506.5 Z M 1182.5 491.5 L 1211.5 491.5 L 1211.5 520.5 L 1182.5 520.5 Z M 786.5 506.5 L 815.5 506.5 L 815.5 520.5 L 786.5 520.5 Z M 944.5 608.5 L 973.5 608.5 L 973.5 627.5 L 944.5 627.5 Z M 944.5 627.5 L 973.5 627.5 L 973.5 637.5 L 944.5 637.5 Z M 1182.5 608.5 L 1211.5 608.5 L 1211.5 637.5 L 1182.5 637.5 Z M 1419.5 608.5 L 1448.5 608.5 L 1448.5 637.5 L 1419.5 637.5 Z M 1498.5 666.5 L 1528.5 666.5 L 1528.5 676.5 L 1498.5 676.5 Z M 1023.5 666.5 L 1053.5 666.5 L 1053.5 685.5 L 1023.5 685.5 Z M 1023.5 685.5 L 1053.5 685.5 L 1053.5 695.5 L 1023.5 695.5 Z M 1498.5 676.5 L 1528.5 676.5 L 1528.5 695.5 L 1498.5 695.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 276.597656 302.042969 L 276.597656 309.40625 L 289.261719 309.40625 L 289.261719 311.824219 L 273.859375 311.824219 L 273.859375 290.351562 L 288.730469 290.351562 L 288.730469 292.765625 L 276.597656 292.765625 L 276.597656 299.628906 L 288.289062 299.628906 L 288.289062 302.042969 Z M 276.597656 302.042969 "/>
 <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 292.234375 301.335938 L 292.265625 300.160156 L 292.382812 299.011719 L 292.589844 297.921875 L 292.855469 296.859375 L 293.207031 295.859375 L 293.679688 294.886719 L 294.414062 293.621094 L 295.328125 292.53125 L 296.359375 291.648438 L 297.539062 290.941406 L 298.832031 290.441406 L 300.304688 290.117188 L 300.570312 290.085938 L 300.867188 290.058594 L 301.132812 290.027344 L 301.71875 290.027344 L 302.042969 289.996094 L 303.929688 290.144531 L 305.578125 290.585938 L 306.992188 291.292969 L 308.171875 292.296875 L 309.113281 293.5625 L 309.847656 295.121094 L 309.9375 295.417969 L 310.027344 295.710938 L 310.113281 296.035156 L 310.230469 296.683594 L 310.320312 297.007812 L 307.523438 297.007812 L 307.226562 295.976562 L 306.84375 295.09375 L 306.375 294.328125 L 305.753906 293.679688 L 305.078125 293.179688 L 304.28125 292.796875 L 303.898438 292.679688 L 303.488281 292.589844 L 303.074219 292.53125 L 302.632812 292.472656 L 302.191406 292.441406 L 301.71875 292.414062 L 300.6875 292.5 L 299.746094 292.707031 L 298.863281 293.03125 L 298.066406 293.53125 L 297.332031 294.152344 L 296.714844 294.886719 L 296.183594 295.742188 L 295.742188 296.683594 L 295.386719 297.714844 L 295.152344 298.832031 L 295.003906 300.042969 L 294.976562 301.308594 L 295.003906 302.691406 L 295.179688 303.929688 L 295.476562 305.105469 L 295.886719 306.136719 L 296.417969 307.109375 L 297.066406 307.933594 L 297.714844 308.613281 L 298.421875 309.140625 L 299.1875 309.554688 L 300.042969 309.847656 L 300.953125 310.027344 L 301.957031 310.085938 L 303.015625 310.027344 L 303.988281 309.820312 L 304.871094 309.464844 L 305.609375 308.964844 L 306.257812 308.316406 L 306.816406 307.523438 L 307.050781 307.050781 L 307.257812 306.519531 L 307.464844 305.960938 L 307.640625 305.34375 L 307.789062 304.695312 L 307.933594 303.988281 L 310.761719 303.988281 L 310.230469 306.609375 L 309.347656 308.730469 L 308.050781 310.378906 L 306.402344 311.558594 L 304.339844 312.234375 L 301.925781 312.5 L 300.21875 312.382812 L 298.6875 312.027344 L 297.300781 311.5 L 296.066406 310.703125 L 294.976562 309.671875 L 294.0625 308.40625 L 293.53125 307.492188 L 293.089844 306.492188 L 292.738281 305.429688 L 292.472656 304.3125 L 292.296875 303.132812 L 292.234375 301.898438 Z M 292.234375 301.335938 "/>
 <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 207 307 L 207 312 M 204 310 L 209 310 M 207 774 L 207 781 M 203 778 L 210 778 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.svg b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.svg
index 1b68ae1..13a28c9 100644
--- a/cells/xnor3/sky130_fd_sc_hd__xnor3_4.svg
+++ b/cells/xnor3/sky130_fd_sc_hd__xnor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 292.5 L 1744.5 292.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 292.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 226.5 734.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 565.5 609.5 L 588.5 609.5 L 588.5 674.5 L 565.5 674.5 Z M 1260.5 643.5 L 1284.5 643.5 L 1284.5 709.5 L 1260.5 709.5 Z M 1142.5 609.5 L 1166.5 609.5 L 1166.5 709.5 L 1142.5 709.5 Z M 1385.5 609.5 L 1408.5 609.5 L 1408.5 709.5 L 1385.5 709.5 Z M 739.5 609.5 L 762.5 609.5 L 762.5 709.5 L 739.5 709.5 Z M 808.5 609.5 L 831.5 609.5 L 831.5 709.5 L 808.5 709.5 Z M 481.5 609.5 L 504.5 609.5 L 504.5 710.5 L 481.5 710.5 Z M 997.5 609.5 L 1020.5 609.5 L 1020.5 710.5 L 997.5 710.5 Z M 1622.5 610.5 L 1646.5 610.5 L 1646.5 710.5 L 1622.5 710.5 Z M 415.5 609.5 L 439.5 609.5 L 439.5 710.5 L 415.5 710.5 Z M 1479.5 616.5 L 1502.5 616.5 L 1502.5 710.5 L 1479.5 710.5 Z M 282.5 609.5 L 306.5 609.5 L 306.5 710.5 L 282.5 710.5 Z M 348.5 609.5 L 372.5 609.5 L 372.5 710.5 L 348.5 710.5 Z M 1557.5 610.5 L 1580.5 610.5 L 1580.5 710.5 L 1557.5 710.5 Z M 1557.5 610.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1478.5 358.5 L 1501.5 358.5 L 1501.5 490.5 L 1478.5 490.5 Z M 1397.5 390.5 L 1421.5 390.5 L 1421.5 490.5 L 1397.5 490.5 Z M 729.5 362.5 L 752.5 362.5 L 752.5 493.5 L 729.5 493.5 Z M 1622.5 358.5 L 1646.5 358.5 L 1646.5 515.5 L 1622.5 515.5 Z M 1142.5 383.5 L 1166.5 383.5 L 1166.5 515.5 L 1142.5 515.5 Z M 805.5 383.5 L 828.5 383.5 L 828.5 515.5 L 805.5 515.5 Z M 484.5 358.5 L 508.5 358.5 L 508.5 515.5 L 484.5 515.5 Z M 970.5 358.5 L 994.5 358.5 L 994.5 515.5 L 970.5 515.5 Z M 418.5 358.5 L 442.5 358.5 L 442.5 515.5 L 418.5 515.5 Z M 282.5 358.5 L 306.5 358.5 L 306.5 515.5 L 282.5 515.5 Z M 1557.5 358.5 L 1580.5 358.5 L 1580.5 515.5 L 1557.5 515.5 Z M 348.5 358.5 L 372.5 358.5 L 372.5 515.5 L 348.5 515.5 Z M 1260.5 415.5 L 1284.5 415.5 L 1284.5 515.5 L 1260.5 515.5 Z M 565.5 415.5 L 588.5 415.5 L 588.5 515.5 L 565.5 515.5 Z M 565.5 415.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 308.5 L 253.5 308.5 L 253.5 335.5 L 226.5 335.5 Z M 1665.5 308.5 L 1691.5 308.5 L 1691.5 335.5 L 1665.5 335.5 Z M 1593.5 308.5 L 1619.5 308.5 L 1619.5 335.5 L 1593.5 335.5 Z M 1521.5 308.5 L 1547.5 308.5 L 1547.5 335.5 L 1521.5 335.5 Z M 1449.5 308.5 L 1475.5 308.5 L 1475.5 335.5 L 1449.5 335.5 Z M 1377.5 308.5 L 1404.5 308.5 L 1404.5 335.5 L 1377.5 335.5 Z M 1305.5 308.5 L 1332.5 308.5 L 1332.5 335.5 L 1305.5 335.5 Z M 1233.5 308.5 L 1260.5 308.5 L 1260.5 335.5 L 1233.5 335.5 Z M 1161.5 308.5 L 1188.5 308.5 L 1188.5 335.5 L 1161.5 335.5 Z M 1089.5 308.5 L 1116.5 308.5 L 1116.5 335.5 L 1089.5 335.5 Z M 1017.5 308.5 L 1044.5 308.5 L 1044.5 335.5 L 1017.5 335.5 Z M 945.5 308.5 L 972.5 308.5 L 972.5 335.5 L 945.5 335.5 Z M 873.5 308.5 L 900.5 308.5 L 900.5 335.5 L 873.5 335.5 Z M 802.5 308.5 L 828.5 308.5 L 828.5 335.5 L 802.5 335.5 Z M 730.5 308.5 L 756.5 308.5 L 756.5 335.5 L 730.5 335.5 Z M 658.5 308.5 L 684.5 308.5 L 684.5 335.5 L 658.5 335.5 Z M 586.5 308.5 L 612.5 308.5 L 612.5 335.5 L 586.5 335.5 Z M 514.5 308.5 L 540.5 308.5 L 540.5 335.5 L 514.5 335.5 Z M 442.5 308.5 L 468.5 308.5 L 468.5 335.5 L 442.5 335.5 Z M 370.5 308.5 L 397.5 308.5 L 397.5 335.5 L 370.5 335.5 Z M 298.5 308.5 L 325.5 308.5 L 325.5 335.5 L 298.5 335.5 Z M 873.5 494.5 L 900.5 494.5 L 900.5 509.5 L 873.5 509.5 Z M 1233.5 494.5 L 1260.5 494.5 L 1260.5 521.5 L 1233.5 521.5 Z M 873.5 509.5 L 900.5 509.5 L 900.5 521.5 L 873.5 521.5 Z M 1017.5 601.5 L 1044.5 601.5 L 1044.5 618.5 L 1017.5 618.5 Z M 1017.5 618.5 L 1044.5 618.5 L 1044.5 627.5 L 1017.5 627.5 Z M 1233.5 601.5 L 1260.5 601.5 L 1260.5 627.5 L 1233.5 627.5 Z M 1449.5 601.5 L 1475.5 601.5 L 1475.5 627.5 L 1449.5 627.5 Z M 1521.5 654.5 L 1547.5 654.5 L 1547.5 663.5 L 1521.5 663.5 Z M 1089.5 654.5 L 1116.5 654.5 L 1116.5 671.5 L 1089.5 671.5 Z M 1089.5 671.5 L 1116.5 671.5 L 1116.5 681.5 L 1089.5 681.5 Z M 1521.5 663.5 L 1547.5 663.5 L 1547.5 681.5 L 1521.5 681.5 Z M 226.5 734.5 L 253.5 734.5 L 253.5 760.5 L 226.5 760.5 Z M 1665.5 734.5 L 1691.5 734.5 L 1691.5 760.5 L 1665.5 760.5 Z M 1593.5 734.5 L 1619.5 734.5 L 1619.5 760.5 L 1593.5 760.5 Z M 1521.5 734.5 L 1547.5 734.5 L 1547.5 760.5 L 1521.5 760.5 Z M 1449.5 734.5 L 1475.5 734.5 L 1475.5 760.5 L 1449.5 760.5 Z M 1377.5 734.5 L 1404.5 734.5 L 1404.5 760.5 L 1377.5 760.5 Z M 1305.5 734.5 L 1332.5 734.5 L 1332.5 760.5 L 1305.5 760.5 Z M 1233.5 734.5 L 1260.5 734.5 L 1260.5 760.5 L 1233.5 760.5 Z M 1161.5 734.5 L 1188.5 734.5 L 1188.5 760.5 L 1161.5 760.5 Z M 1089.5 734.5 L 1116.5 734.5 L 1116.5 760.5 L 1089.5 760.5 Z M 1017.5 734.5 L 1044.5 734.5 L 1044.5 760.5 L 1017.5 760.5 Z M 945.5 734.5 L 972.5 734.5 L 972.5 760.5 L 945.5 760.5 Z M 873.5 734.5 L 900.5 734.5 L 900.5 760.5 L 873.5 760.5 Z M 802.5 734.5 L 828.5 734.5 L 828.5 760.5 L 802.5 760.5 Z M 730.5 734.5 L 756.5 734.5 L 756.5 760.5 L 730.5 760.5 Z M 658.5 734.5 L 684.5 734.5 L 684.5 760.5 L 658.5 760.5 Z M 586.5 734.5 L 612.5 734.5 L 612.5 760.5 L 586.5 760.5 Z M 514.5 734.5 L 540.5 734.5 L 540.5 760.5 L 514.5 760.5 Z M 442.5 734.5 L 468.5 734.5 L 468.5 760.5 L 442.5 760.5 Z M 370.5 734.5 L 397.5 734.5 L 397.5 760.5 L 370.5 760.5 Z M 298.5 734.5 L 325.5 734.5 L 325.5 760.5 L 298.5 760.5 Z M 298.5 734.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface290">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 266.015625 323.039062 L 266.015625 329.703125 L 277.476562 329.703125 L 277.476562 331.886719 L 263.539062 331.886719 L 263.539062 312.460938 L 276.996094 312.460938 L 276.996094 314.644531 L 266.015625 314.644531 L 266.015625 320.855469 L 276.59375 320.855469 L 276.59375 323.039062 Z M 266.015625 323.039062 "/>
 <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 280.167969 322.402344 L 280.191406 321.335938 L 280.300781 320.296875 L 280.484375 319.308594 L 280.726562 318.351562 L 281.046875 317.445312 L 281.472656 316.566406 L 282.136719 315.417969 L 282.964844 314.433594 L 283.898438 313.632812 L 284.960938 312.992188 L 286.136719 312.539062 L 287.46875 312.246094 L 287.707031 312.222656 L 287.972656 312.195312 L 288.214844 312.167969 L 288.746094 312.167969 L 289.039062 312.140625 L 290.746094 312.273438 L 292.238281 312.675781 L 293.515625 313.3125 L 294.582031 314.21875 L 295.433594 315.367188 L 296.101562 316.777344 L 296.179688 317.042969 L 296.261719 317.3125 L 296.339844 317.605469 L 296.449219 318.191406 L 296.527344 318.484375 L 293.996094 318.484375 L 293.730469 317.550781 L 293.382812 316.75 L 292.957031 316.058594 L 292.398438 315.472656 L 291.785156 315.019531 L 291.066406 314.671875 L 290.71875 314.566406 L 290.347656 314.484375 L 289.972656 314.433594 L 289.574219 314.378906 L 289.171875 314.351562 L 288.746094 314.324219 L 287.8125 314.40625 L 286.960938 314.59375 L 286.160156 314.886719 L 285.441406 315.339844 L 284.777344 315.898438 L 284.214844 316.566406 L 283.738281 317.335938 L 283.335938 318.191406 L 283.015625 319.121094 L 282.804688 320.136719 L 282.671875 321.226562 L 282.644531 322.375 L 282.671875 323.625 L 282.832031 324.746094 L 283.097656 325.8125 L 283.46875 326.742188 L 283.949219 327.625 L 284.535156 328.371094 L 285.121094 328.984375 L 285.761719 329.460938 L 286.457031 329.835938 L 287.226562 330.101562 L 288.054688 330.261719 L 288.960938 330.316406 L 289.917969 330.261719 L 290.796875 330.074219 L 291.597656 329.753906 L 292.265625 329.300781 L 292.851562 328.714844 L 293.355469 327.996094 L 293.570312 327.570312 L 293.757812 327.089844 L 293.941406 326.585938 L 294.101562 326.023438 L 294.234375 325.4375 L 294.371094 324.796875 L 296.929688 324.796875 L 296.449219 327.171875 L 295.648438 329.089844 L 294.476562 330.582031 L 292.984375 331.648438 L 291.117188 332.261719 L 288.933594 332.5 L 287.386719 332.394531 L 286.003906 332.074219 L 284.75 331.59375 L 283.628906 330.875 L 282.644531 329.941406 L 281.820312 328.796875 L 281.339844 327.96875 L 280.9375 327.0625 L 280.621094 326.105469 L 280.378906 325.09375 L 280.21875 324.027344 L 280.167969 322.90625 Z M 280.167969 322.402344 "/>
 <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 203 329 L 203 334 M 200 332 L 205 332 M 203 753 L 203 760 M 199 757 L 206 757 " 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 203 327 L 203 336 M 198 332 L 207 332 M 202 333 L 204 333 M 202 331 L 204 331 M 202 331 L 202 333 M 204 331 L 204 333 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_1.svg b/cells/xor2/sky130_fd_sc_hd__xor2_1.svg
index 0a8e20d..bb5b3c1 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_1.svg
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 470.5 112.5 L 1455.5 112.5 L 1455.5 551.5 L 470.5 551.5 Z M 470.5 112.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image303" 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="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 562.5 885.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1237.5 666.5 L 1278.5 666.5 L 1278.5 844.5 L 1237.5 844.5 Z M 641.5 666.5 L 682.5 666.5 L 682.5 844.5 L 641.5 844.5 Z M 756.5 666.5 L 797.5 666.5 L 797.5 844.5 L 756.5 844.5 Z M 871.5 666.5 L 912.5 666.5 L 912.5 844.5 L 871.5 844.5 Z M 986.5 666.5 L 1027.5 666.5 L 1027.5 844.5 L 986.5 844.5 Z M 986.5 666.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1243.5 228.5 L 1284.5 228.5 L 1284.5 502.5 L 1243.5 502.5 Z M 641.5 228.5 L 682.5 228.5 L 682.5 502.5 L 641.5 502.5 Z M 756.5 228.5 L 797.5 228.5 L 797.5 502.5 L 756.5 502.5 Z M 871.5 228.5 L 912.5 228.5 L 912.5 502.5 L 871.5 502.5 Z M 986.5 228.5 L 1027.5 228.5 L 1027.5 502.5 L 986.5 502.5 Z M 986.5 228.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 141.5 L 608.5 141.5 L 608.5 187.5 L 562.5 187.5 Z M 1317.5 141.5 L 1363.5 141.5 L 1363.5 187.5 L 1317.5 187.5 Z M 1191.5 141.5 L 1237.5 141.5 L 1237.5 187.5 L 1191.5 187.5 Z M 1065.5 141.5 L 1111.5 141.5 L 1111.5 187.5 L 1065.5 187.5 Z M 939.5 141.5 L 986.5 141.5 L 986.5 187.5 L 939.5 187.5 Z M 813.5 141.5 L 860.5 141.5 L 860.5 187.5 L 813.5 187.5 Z M 687.5 141.5 L 734.5 141.5 L 734.5 187.5 L 687.5 187.5 Z M 562.5 885.5 L 608.5 885.5 L 608.5 931.5 L 562.5 931.5 Z M 1317.5 885.5 L 1363.5 885.5 L 1363.5 931.5 L 1317.5 931.5 Z M 1191.5 885.5 L 1237.5 885.5 L 1237.5 931.5 L 1191.5 931.5 Z M 1065.5 885.5 L 1111.5 885.5 L 1111.5 931.5 L 1065.5 931.5 Z M 939.5 885.5 L 986.5 885.5 L 986.5 931.5 L 939.5 931.5 Z M 813.5 885.5 L 860.5 885.5 L 860.5 931.5 L 813.5 931.5 Z M 687.5 885.5 L 734.5 885.5 L 734.5 931.5 L 687.5 931.5 Z M 687.5 885.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 562 194 L 608 194 M 562 148 L 608 148 M 562 148 L 562 194 M 608 148 L 608 194 " 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 562 194 L 608 194 M 562 148 L 608 148 M 608 194 L 608 148 M 562 194 L 562 148 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 167 L 522 174 M 518 171 L 525 171 " 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 522 166 L 522 175 M 517 171 L 526 171 M 521 172 L 523 172 M 521 170 L 523 170 M 521 170 L 521 172 M 523 170 L 523 172 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_2.svg b/cells/xor2/sky130_fd_sc_hd__xor2_2.svg
index efd50c7..1353b22 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_2.svg
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 153.5 L 1743.5 153.5 L 1743.5 549.5 L 175.5 549.5 Z M 175.5 153.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image303" 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="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 257.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1525.5 653.5 L 1562.5 653.5 L 1562.5 813.5 L 1525.5 813.5 Z M 323.5 653.5 L 360.5 653.5 L 360.5 813.5 L 323.5 813.5 Z M 426.5 653.5 L 463.5 653.5 L 463.5 813.5 L 426.5 813.5 Z M 530.5 653.5 L 567.5 653.5 L 567.5 813.5 L 530.5 813.5 Z M 634.5 653.5 L 671.5 653.5 L 671.5 813.5 L 634.5 813.5 Z M 865.5 653.5 L 902.5 653.5 L 902.5 813.5 L 865.5 813.5 Z M 969.5 653.5 L 1006.5 653.5 L 1006.5 813.5 L 969.5 813.5 Z M 1073.5 653.5 L 1110.5 653.5 L 1110.5 813.5 L 1073.5 813.5 Z M 1190.5 653.5 L 1227.5 653.5 L 1227.5 813.5 L 1190.5 813.5 Z M 1422.5 653.5 L 1459.5 653.5 L 1459.5 813.5 L 1422.5 813.5 Z M 1422.5 653.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1525.5 258.5 L 1562.5 258.5 L 1562.5 505.5 L 1525.5 505.5 Z M 323.5 258.5 L 360.5 258.5 L 360.5 505.5 L 323.5 505.5 Z M 426.5 258.5 L 463.5 258.5 L 463.5 505.5 L 426.5 505.5 Z M 530.5 258.5 L 567.5 258.5 L 567.5 505.5 L 530.5 505.5 Z M 634.5 258.5 L 671.5 258.5 L 671.5 505.5 L 634.5 505.5 Z M 865.5 258.5 L 902.5 258.5 L 902.5 505.5 L 865.5 505.5 Z M 969.5 258.5 L 1006.5 258.5 L 1006.5 505.5 L 969.5 505.5 Z M 1073.5 258.5 L 1110.5 258.5 L 1110.5 505.5 L 1073.5 505.5 Z M 1190.5 258.5 L 1227.5 258.5 L 1227.5 505.5 L 1190.5 505.5 Z M 1422.5 258.5 L 1459.5 258.5 L 1459.5 505.5 L 1422.5 505.5 Z M 1422.5 258.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 257.5 179.5 L 299.5 179.5 L 299.5 221.5 L 257.5 221.5 Z M 1619.5 179.5 L 1661.5 179.5 L 1661.5 221.5 L 1619.5 221.5 Z M 1505.5 179.5 L 1547.5 179.5 L 1547.5 221.5 L 1505.5 221.5 Z M 1392.5 179.5 L 1434.5 179.5 L 1434.5 221.5 L 1392.5 221.5 Z M 1278.5 179.5 L 1320.5 179.5 L 1320.5 221.5 L 1278.5 221.5 Z M 1165.5 179.5 L 1207.5 179.5 L 1207.5 221.5 L 1165.5 221.5 Z M 1052.5 179.5 L 1094.5 179.5 L 1094.5 221.5 L 1052.5 221.5 Z M 938.5 179.5 L 980.5 179.5 L 980.5 221.5 L 938.5 221.5 Z M 825.5 179.5 L 867.5 179.5 L 867.5 221.5 L 825.5 221.5 Z M 711.5 179.5 L 753.5 179.5 L 753.5 221.5 L 711.5 221.5 Z M 598.5 179.5 L 640.5 179.5 L 640.5 221.5 L 598.5 221.5 Z M 484.5 179.5 L 526.5 179.5 L 526.5 221.5 L 484.5 221.5 Z M 371.5 179.5 L 413.5 179.5 L 413.5 221.5 L 371.5 221.5 Z M 257.5 305.5 L 299.5 305.5 L 299.5 325.5 L 257.5 325.5 Z M 484.5 305.5 L 526.5 305.5 L 526.5 325.5 L 484.5 325.5 Z M 484.5 325.5 L 526.5 325.5 L 526.5 347.5 L 484.5 347.5 Z M 257.5 325.5 L 299.5 325.5 L 299.5 347.5 L 257.5 347.5 Z M 1165.5 557.5 L 1207.5 557.5 L 1207.5 564.5 L 1165.5 564.5 Z M 1165.5 564.5 L 1207.5 564.5 L 1207.5 599.5 L 1165.5 599.5 Z M 484.5 557.5 L 526.5 557.5 L 526.5 599.5 L 484.5 599.5 Z M 257.5 850.5 L 299.5 850.5 L 299.5 892.5 L 257.5 892.5 Z M 1619.5 850.5 L 1661.5 850.5 L 1661.5 892.5 L 1619.5 892.5 Z M 1505.5 850.5 L 1547.5 850.5 L 1547.5 892.5 L 1505.5 892.5 Z M 1392.5 850.5 L 1434.5 850.5 L 1434.5 892.5 L 1392.5 892.5 Z M 1278.5 850.5 L 1320.5 850.5 L 1320.5 892.5 L 1278.5 892.5 Z M 1165.5 850.5 L 1207.5 850.5 L 1207.5 892.5 L 1165.5 892.5 Z M 1052.5 850.5 L 1094.5 850.5 L 1094.5 892.5 L 1052.5 892.5 Z M 938.5 850.5 L 980.5 850.5 L 980.5 892.5 L 938.5 892.5 Z M 825.5 850.5 L 867.5 850.5 L 867.5 892.5 L 825.5 892.5 Z M 711.5 850.5 L 753.5 850.5 L 753.5 892.5 L 711.5 892.5 Z M 598.5 850.5 L 640.5 850.5 L 640.5 892.5 L 598.5 892.5 Z M 484.5 850.5 L 526.5 850.5 L 526.5 892.5 L 484.5 892.5 Z M 371.5 850.5 L 413.5 850.5 L 413.5 892.5 L 371.5 892.5 Z M 371.5 850.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 257 229 L 299 229 M 257 187 L 299 187 M 257 187 L 257 229 M 299 187 L 299 229 " 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 257 229 L 299 229 M 257 187 L 299 187 M 299 229 L 299 187 M 257 229 L 257 187 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 204 L 222 211 M 218 208 L 225 208 " 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 203 L 222 212 M 217 208 L 226 208 M 221 209 L 223 209 M 221 207 L 223 207 M 221 207 L 221 209 M 223 207 L 223 209 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hd__xor2_4.svg b/cells/xor2/sky130_fd_sc_hd__xor2_4.svg
index 196aec5..bd90b71 100644
--- a/cells/xor2/sky130_fd_sc_hd__xor2_4.svg
+++ b/cells/xor2/sky130_fd_sc_hd__xor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" 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="#image275"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 225.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1613.5 605.5 L 1636.5 605.5 L 1636.5 702.5 L 1613.5 702.5 Z M 264.5 605.5 L 287.5 605.5 L 287.5 702.5 L 264.5 702.5 Z M 327.5 605.5 L 349.5 605.5 L 349.5 702.5 L 327.5 702.5 Z M 390.5 605.5 L 412.5 605.5 L 412.5 702.5 L 390.5 702.5 Z M 453.5 605.5 L 475.5 605.5 L 475.5 702.5 L 453.5 702.5 Z M 515.5 605.5 L 538.5 605.5 L 538.5 702.5 L 515.5 702.5 Z M 578.5 605.5 L 600.5 605.5 L 600.5 702.5 L 578.5 702.5 Z M 641.5 605.5 L 663.5 605.5 L 663.5 702.5 L 641.5 702.5 Z M 704.5 605.5 L 726.5 605.5 L 726.5 702.5 L 704.5 702.5 Z M 844.5 605.5 L 866.5 605.5 L 866.5 702.5 L 844.5 702.5 Z M 907.5 605.5 L 929.5 605.5 L 929.5 702.5 L 907.5 702.5 Z M 969.5 605.5 L 992.5 605.5 L 992.5 702.5 L 969.5 702.5 Z M 1032.5 605.5 L 1055.5 605.5 L 1055.5 702.5 L 1032.5 702.5 Z M 1095.5 605.5 L 1117.5 605.5 L 1117.5 702.5 L 1095.5 702.5 Z M 1158.5 605.5 L 1180.5 605.5 L 1180.5 702.5 L 1158.5 702.5 Z M 1220.5 605.5 L 1243.5 605.5 L 1243.5 702.5 L 1220.5 702.5 Z M 1283.5 605.5 L 1306.5 605.5 L 1306.5 702.5 L 1283.5 702.5 Z M 1425.5 605.5 L 1448.5 605.5 L 1448.5 702.5 L 1425.5 702.5 Z M 1488.5 605.5 L 1510.5 605.5 L 1510.5 702.5 L 1488.5 702.5 Z M 1551.5 605.5 L 1573.5 605.5 L 1573.5 702.5 L 1551.5 702.5 Z M 1551.5 605.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1613.5 366.5 L 1636.5 366.5 L 1636.5 516.5 L 1613.5 516.5 Z M 264.5 366.5 L 287.5 366.5 L 287.5 516.5 L 264.5 516.5 Z M 327.5 366.5 L 349.5 366.5 L 349.5 516.5 L 327.5 516.5 Z M 390.5 366.5 L 412.5 366.5 L 412.5 516.5 L 390.5 516.5 Z M 453.5 366.5 L 475.5 366.5 L 475.5 516.5 L 453.5 516.5 Z M 515.5 366.5 L 538.5 366.5 L 538.5 516.5 L 515.5 516.5 Z M 578.5 366.5 L 600.5 366.5 L 600.5 516.5 L 578.5 516.5 Z M 641.5 366.5 L 663.5 366.5 L 663.5 516.5 L 641.5 516.5 Z M 704.5 366.5 L 726.5 366.5 L 726.5 516.5 L 704.5 516.5 Z M 844.5 366.5 L 866.5 366.5 L 866.5 516.5 L 844.5 516.5 Z M 907.5 366.5 L 929.5 366.5 L 929.5 516.5 L 907.5 516.5 Z M 969.5 366.5 L 992.5 366.5 L 992.5 516.5 L 969.5 516.5 Z M 1032.5 366.5 L 1055.5 366.5 L 1055.5 516.5 L 1032.5 516.5 Z M 1095.5 366.5 L 1117.5 366.5 L 1117.5 516.5 L 1095.5 516.5 Z M 1158.5 366.5 L 1180.5 366.5 L 1180.5 516.5 L 1158.5 516.5 Z M 1220.5 366.5 L 1243.5 366.5 L 1243.5 516.5 L 1220.5 516.5 Z M 1283.5 366.5 L 1306.5 366.5 L 1306.5 516.5 L 1283.5 516.5 Z M 1425.5 366.5 L 1448.5 366.5 L 1448.5 516.5 L 1425.5 516.5 Z M 1488.5 366.5 L 1510.5 366.5 L 1510.5 516.5 L 1488.5 516.5 Z M 1551.5 366.5 L 1573.5 366.5 L 1573.5 516.5 L 1551.5 516.5 Z M 1551.5 366.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 500.5 496.5 L 525.5 496.5 L 525.5 522.5 L 500.5 522.5 Z M 1324.5 496.5 L 1350.5 496.5 L 1350.5 522.5 L 1324.5 522.5 Z M 981.5 598.5 L 1006.5 598.5 L 1006.5 616.5 L 981.5 616.5 Z M 981.5 616.5 L 1006.5 616.5 L 1006.5 623.5 L 981.5 623.5 Z M 1393.5 598.5 L 1418.5 598.5 L 1418.5 623.5 L 1393.5 623.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <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 225 761 L 250 761 M 225 735 L 250 735 M 225 735 L 225 761 M 250 735 L 250 761 " 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 225 761 L 250 761 M 225 735 L 250 735 M 250 761 L 250 735 M 225 761 L 225 735 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 203 339 L 203 344 M 200 342 L 205 342 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_1.svg b/cells/xor3/sky130_fd_sc_hd__xor3_1.svg
index e9f4979..e7e3656 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_1.svg
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 268.5 L 1743.5 268.5 L 1743.5 544.5 L 174.5 544.5 Z M 174.5 268.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" 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="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 232.5 754.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 410.5 616.5 L 436.5 616.5 L 436.5 689.5 L 410.5 689.5 Z M 695.5 616.5 L 721.5 616.5 L 721.5 726.5 L 695.5 726.5 Z M 1212.5 654.5 L 1238.5 654.5 L 1238.5 726.5 L 1212.5 726.5 Z M 601.5 616.5 L 627.5 616.5 L 627.5 726.5 L 601.5 726.5 Z M 1081.5 616.5 L 1107.5 616.5 L 1107.5 726.5 L 1081.5 726.5 Z M 1349.5 616.5 L 1374.5 616.5 L 1374.5 726.5 L 1349.5 726.5 Z M 1538.5 618.5 L 1564.5 618.5 L 1564.5 728.5 L 1538.5 728.5 Z M 921.5 616.5 L 947.5 616.5 L 947.5 728.5 L 921.5 728.5 Z M 303.5 616.5 L 329.5 616.5 L 329.5 728.5 L 303.5 728.5 Z M 1610.5 618.5 L 1636.5 618.5 L 1636.5 728.5 L 1610.5 728.5 Z M 1452.5 625.5 L 1478.5 625.5 L 1478.5 728.5 L 1452.5 728.5 Z M 1452.5 625.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1451.5 341.5 L 1477.5 341.5 L 1477.5 486.5 L 1451.5 486.5 Z M 1362.5 375.5 L 1388.5 375.5 L 1388.5 486.5 L 1362.5 486.5 Z M 685.5 344.5 L 711.5 344.5 L 711.5 489.5 L 685.5 489.5 Z M 594.5 344.5 L 620.5 344.5 L 620.5 489.5 L 594.5 489.5 Z M 1081.5 369.5 L 1107.5 369.5 L 1107.5 513.5 L 1081.5 513.5 Z M 410.5 403.5 L 436.5 403.5 L 436.5 513.5 L 410.5 513.5 Z M 1610.5 341.5 L 1636.5 341.5 L 1636.5 513.5 L 1610.5 513.5 Z M 893.5 341.5 L 918.5 341.5 L 918.5 513.5 L 893.5 513.5 Z M 307.5 341.5 L 332.5 341.5 L 332.5 513.5 L 307.5 513.5 Z M 1538.5 341.5 L 1564.5 341.5 L 1564.5 513.5 L 1538.5 513.5 Z M 1212.5 403.5 L 1238.5 403.5 L 1238.5 513.5 L 1212.5 513.5 Z M 1212.5 403.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 286.5 L 261.5 286.5 L 261.5 315.5 L 232.5 315.5 Z M 1657.5 286.5 L 1686.5 286.5 L 1686.5 315.5 L 1657.5 315.5 Z M 1577.5 286.5 L 1607.5 286.5 L 1607.5 315.5 L 1577.5 315.5 Z M 1498.5 286.5 L 1528.5 286.5 L 1528.5 315.5 L 1498.5 315.5 Z M 1419.5 286.5 L 1448.5 286.5 L 1448.5 315.5 L 1419.5 315.5 Z M 1340.5 286.5 L 1369.5 286.5 L 1369.5 315.5 L 1340.5 315.5 Z M 1261.5 286.5 L 1290.5 286.5 L 1290.5 315.5 L 1261.5 315.5 Z M 1182.5 286.5 L 1211.5 286.5 L 1211.5 315.5 L 1182.5 315.5 Z M 1102.5 286.5 L 1132.5 286.5 L 1132.5 315.5 L 1102.5 315.5 Z M 1023.5 286.5 L 1053.5 286.5 L 1053.5 315.5 L 1023.5 315.5 Z M 944.5 286.5 L 973.5 286.5 L 973.5 315.5 L 944.5 315.5 Z M 865.5 286.5 L 894.5 286.5 L 894.5 315.5 L 865.5 315.5 Z M 786.5 286.5 L 815.5 286.5 L 815.5 315.5 L 786.5 315.5 Z M 707.5 286.5 L 736.5 286.5 L 736.5 315.5 L 707.5 315.5 Z M 627.5 286.5 L 657.5 286.5 L 657.5 315.5 L 627.5 315.5 Z M 548.5 286.5 L 578.5 286.5 L 578.5 315.5 L 548.5 315.5 Z M 469.5 286.5 L 498.5 286.5 L 498.5 315.5 L 469.5 315.5 Z M 390.5 286.5 L 419.5 286.5 L 419.5 315.5 L 390.5 315.5 Z M 311.5 286.5 L 340.5 286.5 L 340.5 315.5 L 311.5 315.5 Z M 786.5 491.5 L 815.5 491.5 L 815.5 520.5 L 786.5 520.5 Z M 1182.5 491.5 L 1211.5 491.5 L 1211.5 520.5 L 1182.5 520.5 Z M 944.5 608.5 L 973.5 608.5 L 973.5 630.5 L 944.5 630.5 Z M 944.5 630.5 L 973.5 630.5 L 973.5 637.5 L 944.5 637.5 Z M 1182.5 608.5 L 1211.5 608.5 L 1211.5 637.5 L 1182.5 637.5 Z M 1419.5 608.5 L 1448.5 608.5 L 1448.5 637.5 L 1419.5 637.5 Z M 1498.5 666.5 L 1528.5 666.5 L 1528.5 676.5 L 1498.5 676.5 Z M 1023.5 666.5 L 1053.5 666.5 L 1053.5 685.5 L 1023.5 685.5 Z M 1023.5 685.5 L 1053.5 685.5 L 1053.5 695.5 L 1023.5 695.5 Z M 1498.5 676.5 L 1528.5 676.5 L 1528.5 695.5 L 1498.5 695.5 Z M 232.5 754.5 L 261.5 754.5 L 261.5 783.5 L 232.5 783.5 Z M 1657.5 754.5 L 1686.5 754.5 L 1686.5 783.5 L 1657.5 783.5 Z M 1577.5 754.5 L 1607.5 754.5 L 1607.5 783.5 L 1577.5 783.5 Z M 1498.5 754.5 L 1528.5 754.5 L 1528.5 783.5 L 1498.5 783.5 Z M 1419.5 754.5 L 1448.5 754.5 L 1448.5 783.5 L 1419.5 783.5 Z M 1340.5 754.5 L 1369.5 754.5 L 1369.5 783.5 L 1340.5 783.5 Z M 1261.5 754.5 L 1290.5 754.5 L 1290.5 783.5 L 1261.5 783.5 Z M 1182.5 754.5 L 1211.5 754.5 L 1211.5 783.5 L 1182.5 783.5 Z M 1102.5 754.5 L 1132.5 754.5 L 1132.5 783.5 L 1102.5 783.5 Z M 1023.5 754.5 L 1053.5 754.5 L 1053.5 783.5 L 1023.5 783.5 Z M 944.5 754.5 L 973.5 754.5 L 973.5 783.5 L 944.5 783.5 Z M 865.5 754.5 L 894.5 754.5 L 894.5 783.5 L 865.5 783.5 Z M 786.5 754.5 L 815.5 754.5 L 815.5 783.5 L 786.5 783.5 Z M 707.5 754.5 L 736.5 754.5 L 736.5 783.5 L 707.5 783.5 Z M 627.5 754.5 L 657.5 754.5 L 657.5 783.5 L 627.5 783.5 Z M 548.5 754.5 L 578.5 754.5 L 578.5 783.5 L 548.5 783.5 Z M 469.5 754.5 L 498.5 754.5 L 498.5 783.5 L 469.5 783.5 Z M 390.5 754.5 L 419.5 754.5 L 419.5 783.5 L 390.5 783.5 Z M 311.5 754.5 L 340.5 754.5 L 340.5 783.5 L 311.5 783.5 Z M 311.5 754.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <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 232 793 L 261 793 M 232 764 L 261 764 M 232 764 L 232 793 M 261 764 L 261 793 " 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 232 793 L 261 793 M 232 764 L 261 764 M 261 793 L 261 764 M 232 793 L 232 764 " 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%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 307 L 207 312 M 204 310 L 209 310 " 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 305 L 207 314 M 202 310 L 211 310 M 206 311 L 208 311 M 206 309 L 208 309 M 206 309 L 206 311 M 208 309 L 208 311 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_2.svg b/cells/xor3/sky130_fd_sc_hd__xor3_2.svg
index a54bd1d..caa4431 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_2.svg
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 543.5 L 174.5 543.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 229.5 743.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 474.5 612.5 L 499.5 612.5 L 499.5 681.5 L 474.5 681.5 Z M 656.5 612.5 L 681.5 612.5 L 681.5 717.5 L 656.5 717.5 Z M 1368.5 612.5 L 1392.5 612.5 L 1392.5 717.5 L 1368.5 717.5 Z M 746.5 612.5 L 771.5 612.5 L 771.5 717.5 L 746.5 717.5 Z M 1113.5 612.5 L 1138.5 612.5 L 1138.5 717.5 L 1113.5 717.5 Z M 1238.5 648.5 L 1262.5 648.5 L 1262.5 717.5 L 1238.5 717.5 Z M 304.5 612.5 L 328.5 612.5 L 328.5 719.5 L 304.5 719.5 Z M 1617.5 614.5 L 1642.5 614.5 L 1642.5 719.5 L 1617.5 719.5 Z M 1466.5 620.5 L 1491.5 620.5 L 1491.5 719.5 L 1466.5 719.5 Z M 961.5 612.5 L 985.5 612.5 L 985.5 719.5 L 961.5 719.5 Z M 373.5 612.5 L 397.5 612.5 L 397.5 719.5 L 373.5 719.5 Z M 1548.5 614.5 L 1573.5 614.5 L 1573.5 719.5 L 1548.5 719.5 Z M 1548.5 614.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1465.5 350.5 L 1490.5 350.5 L 1490.5 488.5 L 1465.5 488.5 Z M 1381.5 383.5 L 1406.5 383.5 L 1406.5 488.5 L 1381.5 488.5 Z M 649.5 353.5 L 674.5 353.5 L 674.5 491.5 L 649.5 491.5 Z M 736.5 353.5 L 761.5 353.5 L 761.5 491.5 L 736.5 491.5 Z M 1113.5 376.5 L 1138.5 376.5 L 1138.5 514.5 L 1113.5 514.5 Z M 1617.5 350.5 L 1642.5 350.5 L 1642.5 514.5 L 1617.5 514.5 Z M 1548.5 350.5 L 1573.5 350.5 L 1573.5 514.5 L 1548.5 514.5 Z M 934.5 350.5 L 958.5 350.5 L 958.5 514.5 L 934.5 514.5 Z M 1238.5 409.5 L 1262.5 409.5 L 1262.5 514.5 L 1238.5 514.5 Z M 307.5 350.5 L 332.5 350.5 L 332.5 514.5 L 307.5 514.5 Z M 376.5 350.5 L 400.5 350.5 L 400.5 514.5 L 376.5 514.5 Z M 474.5 409.5 L 499.5 409.5 L 499.5 514.5 L 474.5 514.5 Z M 474.5 409.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 229.5 298.5 L 257.5 298.5 L 257.5 326.5 L 229.5 326.5 Z M 1661.5 298.5 L 1689.5 298.5 L 1689.5 326.5 L 1661.5 326.5 Z M 1586.5 298.5 L 1614.5 298.5 L 1614.5 326.5 L 1586.5 326.5 Z M 1510.5 298.5 L 1538.5 298.5 L 1538.5 326.5 L 1510.5 326.5 Z M 1435.5 298.5 L 1463.5 298.5 L 1463.5 326.5 L 1435.5 326.5 Z M 1360.5 298.5 L 1388.5 298.5 L 1388.5 326.5 L 1360.5 326.5 Z M 1284.5 298.5 L 1312.5 298.5 L 1312.5 326.5 L 1284.5 326.5 Z M 1209.5 298.5 L 1237.5 298.5 L 1237.5 326.5 L 1209.5 326.5 Z M 1134.5 298.5 L 1161.5 298.5 L 1161.5 326.5 L 1134.5 326.5 Z M 1058.5 298.5 L 1086.5 298.5 L 1086.5 326.5 L 1058.5 326.5 Z M 983.5 298.5 L 1011.5 298.5 L 1011.5 326.5 L 983.5 326.5 Z M 908.5 298.5 L 935.5 298.5 L 935.5 326.5 L 908.5 326.5 Z M 832.5 298.5 L 860.5 298.5 L 860.5 326.5 L 832.5 326.5 Z M 757.5 298.5 L 785.5 298.5 L 785.5 326.5 L 757.5 326.5 Z M 681.5 298.5 L 709.5 298.5 L 709.5 326.5 L 681.5 326.5 Z M 606.5 298.5 L 634.5 298.5 L 634.5 326.5 L 606.5 326.5 Z M 531.5 298.5 L 559.5 298.5 L 559.5 326.5 L 531.5 326.5 Z M 455.5 298.5 L 483.5 298.5 L 483.5 326.5 L 455.5 326.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 326.5 L 380.5 326.5 Z M 305.5 298.5 L 332.5 298.5 L 332.5 326.5 L 305.5 326.5 Z M 832.5 493.5 L 860.5 493.5 L 860.5 521.5 L 832.5 521.5 Z M 1209.5 493.5 L 1237.5 493.5 L 1237.5 521.5 L 1209.5 521.5 Z M 983.5 604.5 L 1011.5 604.5 L 1011.5 625.5 L 983.5 625.5 Z M 983.5 625.5 L 1011.5 625.5 L 1011.5 632.5 L 983.5 632.5 Z M 1209.5 604.5 L 1237.5 604.5 L 1237.5 632.5 L 1209.5 632.5 Z M 1435.5 604.5 L 1463.5 604.5 L 1463.5 632.5 L 1435.5 632.5 Z M 1510.5 660.5 L 1538.5 660.5 L 1538.5 669.5 L 1510.5 669.5 Z M 1058.5 660.5 L 1086.5 660.5 L 1086.5 678.5 L 1058.5 678.5 Z M 1058.5 678.5 L 1086.5 678.5 L 1086.5 688.5 L 1058.5 688.5 Z M 1510.5 669.5 L 1538.5 669.5 L 1538.5 688.5 L 1510.5 688.5 Z M 229.5 743.5 L 257.5 743.5 L 257.5 771.5 L 229.5 771.5 Z M 1661.5 743.5 L 1689.5 743.5 L 1689.5 771.5 L 1661.5 771.5 Z M 1586.5 743.5 L 1614.5 743.5 L 1614.5 771.5 L 1586.5 771.5 Z M 1510.5 743.5 L 1538.5 743.5 L 1538.5 771.5 L 1510.5 771.5 Z M 1435.5 743.5 L 1463.5 743.5 L 1463.5 771.5 L 1435.5 771.5 Z M 1360.5 743.5 L 1388.5 743.5 L 1388.5 771.5 L 1360.5 771.5 Z M 1284.5 743.5 L 1312.5 743.5 L 1312.5 771.5 L 1284.5 771.5 Z M 1209.5 743.5 L 1237.5 743.5 L 1237.5 771.5 L 1209.5 771.5 Z M 1134.5 743.5 L 1161.5 743.5 L 1161.5 771.5 L 1134.5 771.5 Z M 1058.5 743.5 L 1086.5 743.5 L 1086.5 771.5 L 1058.5 771.5 Z M 983.5 743.5 L 1011.5 743.5 L 1011.5 771.5 L 983.5 771.5 Z M 908.5 743.5 L 935.5 743.5 L 935.5 771.5 L 908.5 771.5 Z M 832.5 743.5 L 860.5 743.5 L 860.5 771.5 L 832.5 771.5 Z M 757.5 743.5 L 785.5 743.5 L 785.5 771.5 L 757.5 771.5 Z M 681.5 743.5 L 709.5 743.5 L 709.5 771.5 L 681.5 771.5 Z M 606.5 743.5 L 634.5 743.5 L 634.5 771.5 L 606.5 771.5 Z M 531.5 743.5 L 559.5 743.5 L 559.5 771.5 L 531.5 771.5 Z M 455.5 743.5 L 483.5 743.5 L 483.5 771.5 L 455.5 771.5 Z M 380.5 743.5 L 408.5 743.5 L 408.5 771.5 L 380.5 771.5 Z M 305.5 743.5 L 332.5 743.5 L 332.5 771.5 L 305.5 771.5 Z M 305.5 743.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 271.304688 312.542969 L 271.304688 319.554688 L 283.367188 319.554688 L 283.367188 321.855469 L 268.699219 321.855469 L 268.699219 301.40625 L 282.863281 301.40625 L 282.863281 303.707031 L 271.304688 303.707031 L 271.304688 310.242188 L 282.441406 310.242188 L 282.441406 312.542969 Z M 271.304688 312.542969 "/>
 <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 286.203125 311.867188 L 286.230469 310.746094 L 286.339844 309.652344 L 286.539062 308.613281 L 286.789062 307.605469 L 287.125 306.652344 L 287.574219 305.726562 L 288.277344 304.519531 L 289.148438 303.480469 L 290.128906 302.640625 L 291.25 301.96875 L 292.484375 301.488281 L 293.886719 301.179688 L 294.140625 301.152344 L 294.421875 301.125 L 294.671875 301.097656 L 295.234375 301.097656 L 295.542969 301.070312 L 297.335938 301.210938 L 298.90625 301.628906 L 300.253906 302.304688 L 301.375 303.257812 L 302.273438 304.464844 L 302.976562 305.949219 L 303.058594 306.230469 L 303.144531 306.511719 L 303.226562 306.820312 L 303.285156 307.128906 L 303.339844 307.4375 L 303.425781 307.746094 L 300.757812 307.746094 L 300.480469 306.765625 L 300.113281 305.921875 L 299.664062 305.191406 L 299.078125 304.574219 L 298.429688 304.097656 L 297.675781 303.734375 L 297.308594 303.621094 L 296.917969 303.539062 L 296.523438 303.480469 L 296.101562 303.425781 L 295.683594 303.398438 L 295.234375 303.371094 L 294.25 303.453125 L 293.355469 303.648438 L 292.511719 303.957031 L 291.753906 304.433594 L 291.054688 305.023438 L 290.464844 305.726562 L 289.960938 306.539062 L 289.539062 307.4375 L 289.203125 308.417969 L 288.976562 309.484375 L 288.839844 310.632812 L 288.808594 311.839844 L 288.839844 313.160156 L 289.007812 314.335938 L 289.285156 315.460938 L 289.679688 316.441406 L 290.183594 317.367188 L 290.800781 318.152344 L 291.417969 318.796875 L 292.09375 319.300781 L 292.820312 319.695312 L 293.632812 319.976562 L 294.503906 320.144531 L 295.457031 320.199219 L 296.46875 320.144531 L 297.394531 319.949219 L 298.234375 319.609375 L 298.9375 319.132812 L 299.554688 318.515625 L 300.085938 317.757812 L 300.3125 317.3125 L 300.507812 316.804688 L 300.703125 316.273438 L 300.871094 315.683594 L 301.011719 315.066406 L 301.152344 314.394531 L 303.84375 314.394531 L 303.339844 316.890625 L 302.5 318.910156 L 301.265625 320.480469 L 299.695312 321.601562 L 297.730469 322.246094 L 295.429688 322.5 L 293.804688 322.386719 L 292.34375 322.050781 L 291.027344 321.546875 L 289.847656 320.789062 L 288.808594 319.808594 L 287.941406 318.601562 L 287.433594 317.730469 L 287.015625 316.777344 L 286.679688 315.769531 L 286.425781 314.703125 L 286.257812 313.578125 L 286.203125 312.402344 Z M 286.203125 311.867188 "/>
 <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 205 319 L 205 324 M 202 322 L 207 322 M 205 763 L 205 770 M 201 767 L 208 767 " 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 205 317 L 205 326 M 200 322 L 209 322 M 204 323 L 206 323 M 204 321 L 206 321 M 204 321 L 204 323 M 206 321 L 206 323 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hd__xor3_4.svg b/cells/xor3/sky130_fd_sc_hd__xor3_4.svg
index a168b7b..7962cd7 100644
--- a/cells/xor3/sky130_fd_sc_hd__xor3_4.svg
+++ b/cells/xor3/sky130_fd_sc_hd__xor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 303.5 L 1743.5 303.5 L 1743.5 542.5 L 175.5 542.5 Z M 175.5 303.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image321" 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="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 238.5 725.5 L 264.5 725.5 L 264.5 750.5 L 238.5 750.5 Z M 238.5 725.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 553.5 605.5 L 575.5 605.5 L 575.5 668.5 L 553.5 668.5 Z M 1228.5 638.5 L 1250.5 638.5 L 1250.5 701.5 L 1228.5 701.5 Z M 1114.5 605.5 L 1137.5 605.5 L 1137.5 701.5 L 1114.5 701.5 Z M 1347.5 605.5 L 1369.5 605.5 L 1369.5 701.5 L 1347.5 701.5 Z M 698.5 605.5 L 720.5 605.5 L 720.5 701.5 L 698.5 701.5 Z M 780.5 605.5 L 802.5 605.5 L 802.5 701.5 L 780.5 701.5 Z M 450.5 605.5 L 473.5 605.5 L 473.5 702.5 L 450.5 702.5 Z M 975.5 605.5 L 998.5 605.5 L 998.5 702.5 L 975.5 702.5 Z M 1580.5 607.5 L 1602.5 607.5 L 1602.5 702.5 L 1580.5 702.5 Z M 388.5 605.5 L 410.5 605.5 L 410.5 702.5 L 388.5 702.5 Z M 1436.5 613.5 L 1459.5 613.5 L 1459.5 702.5 L 1436.5 702.5 Z M 262.5 605.5 L 284.5 605.5 L 284.5 702.5 L 262.5 702.5 Z M 325.5 605.5 L 347.5 605.5 L 347.5 702.5 L 325.5 702.5 Z M 1511.5 607.5 L 1534.5 607.5 L 1534.5 702.5 L 1511.5 702.5 Z M 1511.5 607.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1436.5 366.5 L 1458.5 366.5 L 1458.5 492.5 L 1436.5 492.5 Z M 1359.5 396.5 L 1381.5 396.5 L 1381.5 492.5 L 1359.5 492.5 Z M 771.5 369.5 L 793.5 369.5 L 793.5 495.5 L 771.5 495.5 Z M 692.5 369.5 L 714.5 369.5 L 714.5 495.5 L 692.5 495.5 Z M 1114.5 390.5 L 1137.5 390.5 L 1137.5 516.5 L 1114.5 516.5 Z M 1511.5 366.5 L 1534.5 366.5 L 1534.5 516.5 L 1511.5 516.5 Z M 465.5 366.5 L 488.5 366.5 L 488.5 516.5 L 465.5 516.5 Z M 951.5 366.5 L 973.5 366.5 L 973.5 516.5 L 951.5 516.5 Z M 402.5 366.5 L 425.5 366.5 L 425.5 516.5 L 402.5 516.5 Z M 277.5 366.5 L 299.5 366.5 L 299.5 516.5 L 277.5 516.5 Z M 539.5 420.5 L 562.5 420.5 L 562.5 516.5 L 539.5 516.5 Z M 340.5 366.5 L 362.5 366.5 L 362.5 516.5 L 340.5 516.5 Z M 1228.5 420.5 L 1250.5 420.5 L 1250.5 516.5 L 1228.5 516.5 Z M 1580.5 366.5 L 1602.5 366.5 L 1602.5 516.5 L 1580.5 516.5 Z M 1580.5 366.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 225.5 318.5 L 250.5 318.5 L 250.5 344.5 L 225.5 344.5 Z M 1668.5 318.5 L 1693.5 318.5 L 1693.5 344.5 L 1668.5 344.5 Z M 1599.5 318.5 L 1625.5 318.5 L 1625.5 344.5 L 1599.5 344.5 Z M 1531.5 318.5 L 1556.5 318.5 L 1556.5 344.5 L 1531.5 344.5 Z M 1462.5 318.5 L 1487.5 318.5 L 1487.5 344.5 L 1462.5 344.5 Z M 1393.5 318.5 L 1418.5 318.5 L 1418.5 344.5 L 1393.5 344.5 Z M 1324.5 318.5 L 1350.5 318.5 L 1350.5 344.5 L 1324.5 344.5 Z M 1256.5 318.5 L 1281.5 318.5 L 1281.5 344.5 L 1256.5 344.5 Z M 1187.5 318.5 L 1212.5 318.5 L 1212.5 344.5 L 1187.5 344.5 Z M 1118.5 318.5 L 1144.5 318.5 L 1144.5 344.5 L 1118.5 344.5 Z M 1049.5 318.5 L 1075.5 318.5 L 1075.5 344.5 L 1049.5 344.5 Z M 981.5 318.5 L 1006.5 318.5 L 1006.5 344.5 L 981.5 344.5 Z M 912.5 318.5 L 937.5 318.5 L 937.5 344.5 L 912.5 344.5 Z M 843.5 318.5 L 869.5 318.5 L 869.5 344.5 L 843.5 344.5 Z M 775.5 318.5 L 800.5 318.5 L 800.5 344.5 L 775.5 344.5 Z M 706.5 318.5 L 731.5 318.5 L 731.5 344.5 L 706.5 344.5 Z M 637.5 318.5 L 662.5 318.5 L 662.5 344.5 L 637.5 344.5 Z M 568.5 318.5 L 594.5 318.5 L 594.5 344.5 L 568.5 344.5 Z M 500.5 318.5 L 525.5 318.5 L 525.5 344.5 L 500.5 344.5 Z M 431.5 318.5 L 456.5 318.5 L 456.5 344.5 L 431.5 344.5 Z M 362.5 318.5 L 388.5 318.5 L 388.5 344.5 L 362.5 344.5 Z M 293.5 318.5 L 319.5 318.5 L 319.5 344.5 L 293.5 344.5 Z M 858.5 496.5 L 884.5 496.5 L 884.5 522.5 L 858.5 522.5 Z M 1202.5 496.5 L 1227.5 496.5 L 1227.5 522.5 L 1202.5 522.5 Z M 996.5 598.5 L 1021.5 598.5 L 1021.5 617.5 L 996.5 617.5 Z M 996.5 617.5 L 1021.5 617.5 L 1021.5 623.5 L 996.5 623.5 Z M 1202.5 598.5 L 1227.5 598.5 L 1227.5 623.5 L 1202.5 623.5 Z M 1408.5 598.5 L 1433.5 598.5 L 1433.5 623.5 L 1408.5 623.5 Z M 1477.5 649.5 L 1502.5 649.5 L 1502.5 657.5 L 1477.5 657.5 Z M 1064.5 649.5 L 1090.5 649.5 L 1090.5 665.5 L 1064.5 665.5 Z M 1064.5 665.5 L 1090.5 665.5 L 1090.5 674.5 L 1064.5 674.5 Z M 1477.5 657.5 L 1502.5 657.5 L 1502.5 674.5 L 1477.5 674.5 Z M 225.5 725.5 L 250.5 725.5 L 250.5 750.5 L 225.5 750.5 Z M 1668.5 725.5 L 1693.5 725.5 L 1693.5 750.5 L 1668.5 750.5 Z M 1599.5 725.5 L 1625.5 725.5 L 1625.5 750.5 L 1599.5 750.5 Z M 1531.5 725.5 L 1556.5 725.5 L 1556.5 750.5 L 1531.5 750.5 Z M 1462.5 725.5 L 1487.5 725.5 L 1487.5 750.5 L 1462.5 750.5 Z M 1393.5 725.5 L 1418.5 725.5 L 1418.5 750.5 L 1393.5 750.5 Z M 1324.5 725.5 L 1350.5 725.5 L 1350.5 750.5 L 1324.5 750.5 Z M 1256.5 725.5 L 1281.5 725.5 L 1281.5 750.5 L 1256.5 750.5 Z M 1187.5 725.5 L 1212.5 725.5 L 1212.5 750.5 L 1187.5 750.5 Z M 1118.5 725.5 L 1144.5 725.5 L 1144.5 750.5 L 1118.5 750.5 Z M 1049.5 725.5 L 1075.5 725.5 L 1075.5 750.5 L 1049.5 750.5 Z M 981.5 725.5 L 1006.5 725.5 L 1006.5 750.5 L 981.5 750.5 Z M 912.5 725.5 L 937.5 725.5 L 937.5 750.5 L 912.5 750.5 Z M 843.5 725.5 L 869.5 725.5 L 869.5 750.5 L 843.5 750.5 Z M 775.5 725.5 L 800.5 725.5 L 800.5 750.5 L 775.5 750.5 Z M 706.5 725.5 L 731.5 725.5 L 731.5 750.5 L 706.5 750.5 Z M 637.5 725.5 L 662.5 725.5 L 662.5 750.5 L 637.5 750.5 Z M 568.5 725.5 L 594.5 725.5 L 594.5 750.5 L 568.5 750.5 Z M 500.5 725.5 L 525.5 725.5 L 525.5 750.5 L 500.5 750.5 Z M 431.5 725.5 L 456.5 725.5 L 456.5 750.5 L 431.5 750.5 Z M 362.5 725.5 L 388.5 725.5 L 388.5 750.5 L 362.5 750.5 Z M 293.5 725.5 L 319.5 725.5 L 319.5 750.5 L 293.5 750.5 Z M 293.5 725.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface289">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,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 262.726562 332.539062 L 262.726562 338.847656 L 273.582031 338.847656 L 273.582031 340.917969 L 260.378906 340.917969 L 260.378906 322.515625 L 273.125 322.515625 L 273.125 324.585938 L 262.726562 324.585938 L 262.726562 330.46875 L 272.75 330.46875 L 272.75 332.539062 Z M 262.726562 332.539062 "/>
 <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 276.132812 331.933594 L 276.15625 330.921875 L 276.257812 329.9375 L 276.433594 329.003906 L 276.660156 328.09375 L 276.964844 327.234375 L 277.367188 326.402344 L 278 325.316406 L 278.78125 324.382812 L 279.664062 323.625 L 280.675781 323.019531 L 281.785156 322.589844 L 283.046875 322.3125 L 283.277344 322.289062 L 283.527344 322.261719 L 283.753906 322.238281 L 284.261719 322.238281 L 284.539062 322.210938 L 286.152344 322.339844 L 287.566406 322.71875 L 288.777344 323.324219 L 289.789062 324.179688 L 290.597656 325.265625 L 291.226562 326.605469 L 291.304688 326.859375 L 291.378906 327.109375 L 291.457031 327.386719 L 291.503906 327.664062 L 291.554688 327.941406 L 291.632812 328.222656 L 289.234375 328.222656 L 288.980469 327.335938 L 288.652344 326.578125 L 288.25 325.921875 L 287.71875 325.367188 L 287.136719 324.9375 L 286.457031 324.609375 L 286.128906 324.511719 L 285.773438 324.433594 L 285.421875 324.382812 L 285.042969 324.332031 L 284.664062 324.308594 L 284.261719 324.28125 L 283.375 324.359375 L 282.570312 324.535156 L 281.8125 324.8125 L 281.128906 325.242188 L 280.5 325.773438 L 279.96875 326.402344 L 279.515625 327.136719 L 279.136719 327.941406 L 278.832031 328.828125 L 278.628906 329.785156 L 278.503906 330.820312 L 278.480469 331.90625 L 278.503906 333.09375 L 278.65625 334.152344 L 278.90625 335.164062 L 279.261719 336.046875 L 279.714844 336.878906 L 280.269531 337.585938 L 280.828125 338.167969 L 281.433594 338.621094 L 282.089844 338.976562 L 282.820312 339.226562 L 283.605469 339.378906 L 284.460938 339.429688 L 285.371094 339.378906 L 286.203125 339.203125 L 286.960938 338.898438 L 287.59375 338.46875 L 288.148438 337.914062 L 288.628906 337.234375 L 288.828125 336.828125 L 289.007812 336.375 L 289.183594 335.894531 L 289.335938 335.367188 L 289.460938 334.808594 L 289.585938 334.203125 L 292.011719 334.203125 L 291.554688 336.449219 L 290.796875 338.269531 L 289.6875 339.683594 L 288.273438 340.691406 L 286.507812 341.273438 L 284.4375 341.5 L 282.972656 341.398438 L 281.660156 341.097656 L 280.472656 340.640625 L 279.414062 339.960938 L 278.480469 339.078125 L 277.695312 337.992188 L 277.242188 337.207031 L 276.863281 336.351562 L 276.558594 335.441406 L 276.332031 334.480469 L 276.179688 333.472656 L 276.132812 332.410156 Z M 276.132812 331.933594 "/>
 <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 203 339 L 203 344 M 200 342 L 205 342 M 203 744 L 203 751 M 199 748 L 206 748 " 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 203 337 L 203 346 M 198 342 L 207 342 M 202 343 L 204 343 M 202 341 L 204 341 M 202 341 L 202 343 M 204 341 L 204 343 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>