Small update to `.svg` style.

Updating sky130_fd_sc_hd 0.0.1.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
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)"/><